Skip to content

Commit cd60865

Browse files
authored
feat: 회원정보 수정 320px (#289)
1 parent 34b92cb commit cd60865

File tree

10 files changed

+195
-106
lines changed

10 files changed

+195
-106
lines changed

src/pages/myPage/AccountDelete/AccountDelete.css

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/pages/myPage/AccountDelete/AccountDelete.jsx

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ import axios from "axios";
22
import Cookies from "js-cookie";
33

44
import SmallOnOffBtn from "../../../components/button/RoundBtn_135_40";
5-
5+
import useWindowDimensions from "@/hooks/useWindowDimensions";
66
import { SERVER_URL } from "../../../constants/ServerURL";
77

8-
import "./AccountDelete.css";
8+
import "./AccountDelete.scss";
99

1010
const AccountDelete = ({ setIsAccountSuccessfullyDeleted }) => {
11+
const { isSmallMobile, isMobile } = useWindowDimensions().widthConditions;
1112
const onClickDeleteAccountConfirm = async () => {
1213
try {
1314
await axios.delete(`${SERVER_URL}profile/deleteUser`, {
@@ -25,21 +26,26 @@ const AccountDelete = ({ setIsAccountSuccessfullyDeleted }) => {
2526

2627
return (
2728
<div className="account-delete">
28-
<h1>계정 삭제</h1>
29-
<p className="p-medium-regular" id="title">
29+
<p className={`${isSmallMobile ? "p-medium-bold" : "h4-bold"}`}>
30+
계정 삭제
31+
</p>
32+
<p
33+
className={`${isSmallMobile ? "p-xs-regular" : "p-medium-regular"}`}
34+
id="title"
35+
>
3036
잠깐! 정말 떠나실 건가요...?
3137
</p>
3238
<div className="delete-wrap">
3339
<p className="p-small-bold" id="check">
3440
아래 내용을 확인해주세요.
3541
</p>
36-
<ul>
42+
<ul className={`${isSmallMobile ? "p-12-regular" : "p-small-regular"}`}>
3743
<li>등록한 작품 및 구매한 작품에 대한 기록이 사라져요.</li>
3844
<li>프로필, 희망 대본 신청 내역이 모두 사라져요.</li>
3945
<li>구매 작품에 대한 문의사항 및 후기도 삭제돼요.</li>
4046
</ul>
4147
</div>
42-
<div className="j-content-end" id="btn-wrap">
48+
<div className=" j-content-end" id="btn-wrap">
4349
<SmallOnOffBtn onClick={onClickDeleteAccountConfirm} color="grey">
4450
계정 삭제하기
4551
</SmallOnOffBtn>
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
@use "../../../styles/_responsive.scss" as r;
2+
3+
.account-delete {
4+
width: 414px;
5+
6+
@include r.media-small-mobile {
7+
width: 268px;
8+
}
9+
}
10+
11+
.account-delete p#title {
12+
margin-top: 45px;
13+
margin-bottom: 26px;
14+
15+
@include r.media-small-mobile {
16+
margin-top: 10px;
17+
margin-bottom: 30px;
18+
}
19+
}
20+
21+
.account-delete .delete-wrap {
22+
padding-top: 26px;
23+
padding-left: 27px;
24+
padding-bottom: 45px;
25+
26+
border-radius: 20px;
27+
border: 2px dashed var(--Main, #9591f2);
28+
29+
@include r.media-small-mobile {
30+
padding-top: 20px;
31+
padding-left: 20px;
32+
padding-bottom: 25px;
33+
padding-right: 16px;
34+
}
35+
}
36+
37+
.account-delete .delete-wrap p#check {
38+
margin: 0;
39+
margin-bottom: 35px;
40+
@include r.media-small-mobile {
41+
margin-bottom: 25px;
42+
}
43+
}
44+
45+
.account-delete .delete-wrap ul {
46+
padding-left: 25px;
47+
@include r.media-small-mobile {
48+
padding-left: 15px;
49+
}
50+
}
51+
52+
.account-delete .delete-wrap li {
53+
margin-bottom: 11px;
54+
color: #000;
55+
}
56+
57+
.account-delete div#btn-wrap {
58+
gap: 0.94rem;
59+
margin-top: 49px;
60+
}

src/pages/myPage/AccountDelete/AccountDeleteSuccess.jsx

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,33 @@ import { useNavigate } from "react-router-dom";
44
import AuthContext from "../../../contexts/AuthContext";
55

66
import check from "../../../assets/image/myPage/check.svg";
7-
7+
import useWindowDimensions from "@/hooks/useWindowDimensions";
88
import "./AccountDeleteSuccess.scss";
99

1010
const AccountDeleteSuccess = () => {
1111
const navigate = useNavigate();
1212
const { logout } = useContext(AuthContext);
13+
const { isSmallMobile, isMobile } = useWindowDimensions().widthConditions;
1314
return (
1415
<div className="delete-complete">
15-
<h1>계정 삭제</h1>
16+
<p className={`${isSmallMobile ? "p-medium-bold" : "h4-bold"}`}>
17+
계정 삭제
18+
</p>
1619
<div className="delete-complete-wrap">
17-
<div className="delete-complete-box">
20+
<div
21+
className={`delete-complete-box ${
22+
isSmallMobile ? "p-12-regular" : "p-small-regular"
23+
}`}
24+
>
1825
<p>계정 삭제가 완료되었습니다.</p>
1926
<p>그동안 포도상점을 이용해주셔서 진심으로 감사합니다.</p>
27+
2028
<p>더욱 성장하는 포도상점이 되겠습니다.</p>
2129
</div>
2230
<img src={check} alt="check"></img>
2331
</div>
2432
<button
25-
className="main-page-btn"
33+
className={`main-page-btn p-large-bold`}
2634
onClick={() => {
2735
logout();
2836
navigate("/");
Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@use "./../../../components/button/_mixins.scss" as m;
2+
@use "../../../styles/_responsive.scss" as r;
23

34
.delete-complete .delete-complete-wrap {
45
display: flex;
@@ -7,16 +8,27 @@
78
position: relative;
89

910
margin-top: 72px;
11+
12+
width: 414px;
13+
14+
@include r.media-small-mobile {
15+
width: 268px;
16+
margin-top: 69px;
17+
}
1018
}
1119

1220
.delete-complete .delete-complete-box {
13-
padding: 2.69rem 1.69rem;
21+
padding: 43px 27px 39px;
1422

1523
width: 100%;
1624

1725
box-sizing: border-box;
18-
border-radius: 1.25rem;
26+
border-radius: 20px;
1927
border: 2px dashed var(--Main, #9591f2);
28+
29+
@include r.media-small-mobile {
30+
padding: 42px 42px;
31+
}
2032
}
2133

2234
.delete-complete .delete-complete-wrap img {
@@ -32,20 +44,15 @@
3244
text-align: center;
3345

3446
color: #000;
35-
text-align: center;
36-
font-size: 16px;
37-
font-style: normal;
38-
font-weight: 400;
39-
line-height: normal;
4047
}
4148

4249
.delete-complete .main-page-btn {
4350
@include m.purple-btn;
4451

45-
margin-top: 2.5rem;
52+
margin-top: 32px;
4653

4754
width: 414px;
48-
height: 3rem;
55+
height: 48px;
4956

5057
border: none;
5158
border-radius: 1.875rem;
@@ -55,10 +62,8 @@
5562

5663
color: #fff;
5764

58-
/* H5/Bold */
59-
font-family: "Noto Sans KR";
60-
font-size: 1.25rem;
61-
font-style: normal;
62-
font-weight: 700;
63-
line-height: 1.75rem; /* 140% */
65+
@include r.media-small-mobile {
66+
width: 268px;
67+
margin-top: 60px;
68+
}
6469
}

src/pages/myPage/AccountInfoChange.jsx

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ const AccountInfoChange = () => {
1717
const [changeShowPermission, setChangeShowPermission] = useState(false);
1818

1919
// 계정 삭제
20-
const [isDeleteAccountBtnClicked, setIsDeleteAccountBtnClicked] = useState(false);
21-
const [isAccountSuccessfullyDeleted, setIsAccountSuccessfullyDeleted] = useState(false);
20+
const [isDeleteAccountBtnClicked, setIsDeleteAccountBtnClicked] =
21+
useState(false);
22+
const [isAccountSuccessfullyDeleted, setIsAccountSuccessfullyDeleted] =
23+
useState(false);
2224

2325
const { userNickname } = useContext(AuthContext);
2426

@@ -30,16 +32,24 @@ const AccountInfoChange = () => {
3032
<div className="content-side-inside">
3133
{!changeShowPermission ? (
3234
/* 회원 정보 수정 진입 페이지 */
33-
<AccountInfoChangeEnter setChangeShowPermission={setChangeShowPermission} />
35+
<AccountInfoChangeEnter
36+
setChangeShowPermission={setChangeShowPermission}
37+
/>
3438
) : isAccountSuccessfullyDeleted ? (
3539
/* 계정 삭제 완료 페이지 */
3640
<AccountDeleteSuccess />
3741
) : isDeleteAccountBtnClicked ? (
3842
/* 계정 삭제 페이지 */
39-
<AccountDelete setIsAccountSuccessfullyDeleted={setIsAccountSuccessfullyDeleted} />
43+
<AccountDelete
44+
setIsAccountSuccessfullyDeleted={
45+
setIsAccountSuccessfullyDeleted
46+
}
47+
/>
4048
) : (
4149
// 회원 정보 수정 페이지
42-
<AccountInfoChangeMain setIsDeleteAccountBtnClicked={setIsDeleteAccountBtnClicked} />
50+
<AccountInfoChangeMain
51+
setIsDeleteAccountBtnClicked={setIsDeleteAccountBtnClicked}
52+
/>
4353
)}
4454
</div>
4555
</div>

src/pages/myPage/AccountInfoChange/ChangeEnter.jsx

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const AccountInfoChangeEnter = ({ setChangeShowPermission }) => {
1818
const [showPwValid, setShowPwValid] = useState(false);
1919

2020
const {
21-
widthConditions: { isMobile },
21+
widthConditions: { isMobile, isSmallMobile },
2222
} = useWindowDimensions();
2323

2424
const onClickInputBtn = async () => {
@@ -53,9 +53,16 @@ const AccountInfoChangeEnter = ({ setChangeShowPermission }) => {
5353
<EnterForm onSubmit={onClickInputBtn}>
5454
<div className="info-change-enter">
5555
{/* 진입 페이지 */}
56-
<h1>회원 정보 수정</h1>
57-
<h6>회원 정보 수정을 위해서 비밀번호를 다시 한 번 입력해주세요.</h6>
58-
<div className="a-items-start" id="enter-input">
56+
<h4 className={`${isSmallMobile ? "p-medium-bold" : "h4-bold"}`}>
57+
회원 정보 수정
58+
</h4>
59+
<h6 className={`${isSmallMobile ? "p-xs-medium" : "p-medium-medium"}`}>
60+
회원 정보 수정을 위해서 비밀번호를 다시 한 번 입력해주세요.
61+
</h6>
62+
<div
63+
className={` a-items-start ${isSmallMobile ? "w-[280px]" : ""}`}
64+
id="enter-input"
65+
>
5966
<AuthPwInputField
6067
placeholder="비밀번호를 입력해주세요."
6168
value={typedPassword}
@@ -65,7 +72,13 @@ const AccountInfoChangeEnter = ({ setChangeShowPermission }) => {
6572
}}
6673
errorFlag={showPwValid && !pwValid}
6774
errorMessage="비밀번호가 일치하지 않습니다."
68-
style={isMobile ? { width: "332px" } : {}}
75+
style={
76+
isMobile
77+
? { width: "332px" }
78+
: isSmallMobile
79+
? { width: "224px", height: "48px" }
80+
: { width: "414px" }
81+
}
6982
></AuthPwInputField>
7083
<button
7184
className="p-small-bold c-white t-align-center c-pointer"

0 commit comments

Comments
 (0)