Skip to content

Commit

Permalink
Merge pull request #802 from snorose/origin/fix/#789-change-illustrat…
Browse files Browse the repository at this point in the history
…ions

#789 [FIX] 일러스트를 사람에서 별 모양 일러스트로 수정
  • Loading branch information
quothraven1122 authored Jan 24, 2025
2 parents 7f7dc8a + 9fc5838 commit 79a14f7
Show file tree
Hide file tree
Showing 14 changed files with 87 additions and 82 deletions.
1 change: 1 addition & 0 deletions src/assets/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions src/pages/LoginPage/FindIdPage/FindIdPage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -24,6 +22,7 @@

.findIdFrame {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
Expand Down
13 changes: 3 additions & 10 deletions src/pages/LoginPage/FoundIdPage/FoundIdPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -36,15 +34,10 @@ export default function FoundIdPage() {
<span className={`${styles.dot} ${styles.third}`}></span>
</div>
</div>
<div className={styles.pageMiddleFrame}>
<Icon id='star-mail' width={231} height={217} />
</div>
<div className={styles.pageBottomFrame}>
<div className={styles.bodyFrame}>
<img
src={excitedWoman}
alt='frustrated woman image'
className={styles.img}
/>
</div>

<Link to='/login'>
<div className={styles.loginButton}>
<Submit btnName='로그인하기' className='right' />
Expand Down
11 changes: 5 additions & 6 deletions src/pages/LoginPage/FoundIdPage/FoundIdPage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
.pageTitle {
font-size: 1.25rem;
font-weight: 700;
margin-top: 0.875rem;
margin-top: 3.2rem;
}

.pageExplanation {
Expand Down Expand Up @@ -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 {
Expand Down
14 changes: 4 additions & 10 deletions src/pages/LoginPage/FoundPwPage/FoundPwPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -24,7 +22,7 @@ export default function FoundPwPage() {
return (
<div className={styles.pageFrame}>
<BackAppBar backNavTo='/login' />
<div className={styles.pageBottomFrame}>
<div className={styles.pageTopFrame}>
<p className={styles.pageTitle}>비밀번호 찾기</p>
<p className={styles.pageSubtitle}>
비밀번호 초기화 이메일이 발송되었어요
Expand All @@ -43,14 +41,10 @@ export default function FoundPwPage() {
</div>
</div>
</div>
<div className={styles.pageMiddleFrame}>
<Icon id='star-mail' width={231} height={217} />
</div>
<div className={styles.pageBottomFrame}>
<div className={styles.bodyFrame}>
<img
src={EnlightenedWoman}
alt='frustrated woman image'
className={styles.img}
/>
</div>
<Link to='/find-pw'>
<div className={styles.loginButton}>
<Submit btnName='뒤로가기' className='right' />
Expand Down
20 changes: 11 additions & 9 deletions src/pages/LoginPage/FoundPwPage/FoundPwPage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
28 changes: 16 additions & 12 deletions src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import { useEffect } from 'react';
import { Link, useLocation, useNavigate } from 'react-router-dom';

import { Submit } from '@/components/Submit';

import frustratedWoman from '@/assets/images/frustratedWoman.svg';
import { Icon } from '@/components/Icon';

import styles from './NotFoundIdPage.module.css';
import { BackAppBar } from '@/components/index.js';
Expand All @@ -21,19 +20,24 @@ export default function NotFoundIdPage() {

return (
<div className={styles.pageFrame}>
<BackAppBar backNavTo='/login' />
<BackAppBar backNavTo='/login' classname={styles.backAppBar} />
<div className={styles.pageTopFrame}>
<p className={styles.pageTitle}>아이디 찾기</p>
<p className={styles.pageExplanation}>
입력하신 정보와 일치하는 정보가 없어요
</p>
<div className={styles.explanation}>
<p className={styles.pageTitle}>아이디 찾기</p>
<p className={styles.pageExplanation}>
입력하신 정보와 일치하는 정보가 없어요
</p>
</div>
</div>
<div className={styles.pageBottomFrame}>
<img
src={frustratedWoman}
alt='frustrated woman image'
className={styles.img}
<div className={styles.pageMiddleFrame}>
<Icon
id='star-alert'
className={styles.starAlert}
width={231}
height={217}
/>
</div>
<div className={styles.pageBottomFrame}>
<Link to='/find-id'>
<div className={styles.goBackButton}>
<Submit btnName='뒤로가기' className='wrong' />
Expand Down
24 changes: 16 additions & 8 deletions src/pages/LoginPage/NotFoundIdPage/NotFoundIdPage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
Expand Down
11 changes: 4 additions & 7 deletions src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import { useEffect } from 'react';
import { Link, useLocation, useNavigate } from 'react-router-dom';

import { Submit } from '@/components/Submit';

import frustratedWoman from '@/assets/images/frustratedWoman.svg';
import { Icon } from '@/components/Icon';

import styles from './NotFoundPwPage.module.css';
import { BackAppBar } from '@/components/index.js';
Expand All @@ -29,12 +28,10 @@ export default function NotFoundPwPage() {
입력하신 정보와 일치하는 정보가 없어요
</p>
</div>
<div className={styles.pageMiddleFrame}>
<Icon id='star-alert' width={231} height={217} />
</div>
<div className={styles.pageBottomFrame}>
<img
src={frustratedWoman}
alt='frustrated woman image'
className={styles.img}
/>
<Link to='/find-pw'>
<div className={styles.goBackButton}>
<Submit btnName='뒤로가기' className='ready' />
Expand Down
8 changes: 7 additions & 1 deletion src/pages/LoginPage/NotFoundPwPage/NotFoundPwPage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,20 @@
margin: 0 auto;
}

.pageMiddleFrame {
display: flex;
justify-content: center;
align-items: center;
}

.pageTopFrame {
padding: 0 1.25rem;
}

.pageTitle {
font-size: 1.25rem;
font-weight: 700;
margin-top: 0.875rem;
margin-top: 3.2rem;
}

.pageExplanation {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ import { useEffect } from 'react';
import { Link, useLocation, useNavigate } from 'react-router-dom';

import { Submit } from '@/components/Submit';

import frustratedWoman from '@/assets/images/frustratedWoman.svg';
import { Icon } from '@/components/Icon';

import styles from './SignUpFailurePage.module.css';
import { BackAppBar } from '@/components/index.js';
Expand All @@ -26,12 +25,10 @@ export default function SignUpFailurePage() {
<p className={styles.pageTitle}>회원가입 실패</p>
<p className={styles.pageExplanation}>{state?.message}</p>
</div>
<div className={styles.pageMiddleFrame}>
<Icon id='star-alert' width={231} height={217} />
</div>
<div className={styles.pageBottomFrame}>
<img
src={frustratedWoman}
alt='frustrated woman image'
className={styles.img}
/>
<Link to='/signup'>
<div className={styles.loginButton}>
<Submit btnName='뒤로가기' className='right' />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
.pageTitle {
font-size: 1.25rem;
font-weight: 700;
margin-top: 0.875rem;
margin-top: 3.2rem;
}

.pageExplanation {
Expand All @@ -25,6 +25,12 @@
margin-top: 0.875rem;
}

.pageMiddleFrame {
display: flex;
justify-content: center;
align-items: center;
}

.pageBottomFrame {
padding: 0 1.25rem;
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -30,11 +28,11 @@ export default function SignUpSuccessPage() {
스노로즈 전체 서비스를 이용하실 수 있어요
</p>
</div>
<div>
<div className={styles.img}>
<img src={excitedWoman} alt='excitedWoman' />
</div>
<div className={styles.img}>
<Icon id='star-check' width={231} height={217} />
</div>

<div>
<div className={styles.submit}>
<Submit
btnName='로그인하기'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@

.img {
width: 100%;
height: fit-content;
display: flex;
justify-content: flex-end;
padding-right: 0.813rem;
justify-content: center;
align-items: center;
}

.submit {
Expand Down

0 comments on commit 79a14f7

Please sign in to comment.