Skip to content

Commit 3315c3a

Browse files
author
bu2000
committed
글자꺠짐 현상 해결
1 parent 1e99425 commit 3315c3a

3 files changed

Lines changed: 45 additions & 47 deletions

File tree

‎.screen-graph.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -239,15 +239,15 @@
239239
}
240240
},
241241
{
242-
"id": "src\\screens\\Desktop\\sections\\Community\\Community.jsx:53:6-to-src\\screens\\CommunityPage\\CommunityPage.jsx",
242+
"id": "src\\screens\\Desktop\\sections\\Community\\Community.jsx:45:6-to-src\\screens\\CommunityPage\\CommunityPage.jsx",
243243
"source": "src\\screens\\Desktop\\Desktop.jsx",
244244
"target": "src\\screens\\CommunityPage\\CommunityPage.jsx",
245245
"data": {
246246
"viaRoute": "/communitypage",
247247
"trigger": {
248248
"element": "<Link className=\"community-header\" to=\"/communitypage\">\r\n <div className=\"community-header-2\">재료 나눔 게시판</div>\r\n </Link>",
249-
"line": 53,
250-
"endLine": 55,
249+
"line": 45,
250+
"endLine": 47,
251251
"column": 6,
252252
"endColumn": 13,
253253
"sourceFile": "src\\screens\\Desktop\\sections\\Community\\Community.jsx"
@@ -671,47 +671,47 @@
671671
}
672672
},
673673
{
674-
"id": "src\\screens\\CommunityContent\\sections\\Communitycontentpage\\Communitycontentpage.jsx:51:10-to-src\\screens\\CommunityPage\\CommunityPage.jsx",
674+
"id": "src\\screens\\CommunityContent\\sections\\Communitycontentpage\\Communitycontentpage.jsx:57:10-to-src\\screens\\CommunityPage\\CommunityPage.jsx",
675675
"source": "src\\screens\\CommunityContent\\sections\\Communitycontentpage\\Communitycontentpage.jsx",
676676
"target": "src\\screens\\CommunityPage\\CommunityPage.jsx",
677677
"data": {
678678
"viaRoute": "/communitypage",
679679
"trigger": {
680680
"element": "navigate(\"/communitypage\")",
681-
"line": 51,
682-
"endLine": 51,
681+
"line": 57,
682+
"endLine": 57,
683683
"column": 10,
684684
"endColumn": 36,
685685
"sourceFile": "src\\screens\\CommunityContent\\sections\\Communitycontentpage\\Communitycontentpage.jsx"
686686
}
687687
}
688688
},
689689
{
690-
"id": "src\\screens\\CommunityContent\\sections\\Communitycontentpage\\Communitycontentpage.jsx:125:8-to-src\\screens\\CommunityPage\\CommunityPage.jsx",
690+
"id": "src\\screens\\CommunityContent\\sections\\Communitycontentpage\\Communitycontentpage.jsx:124:8-to-src\\screens\\CommunityPage\\CommunityPage.jsx",
691691
"source": "src\\screens\\CommunityContent\\sections\\Communitycontentpage\\Communitycontentpage.jsx",
692692
"target": "src\\screens\\CommunityPage\\CommunityPage.jsx",
693693
"data": {
694694
"viaRoute": "/communitypage",
695695
"trigger": {
696696
"element": "navigate(\"/communitypage\")",
697-
"line": 125,
698-
"endLine": 125,
697+
"line": 124,
698+
"endLine": 124,
699699
"column": 8,
700700
"endColumn": 34,
701701
"sourceFile": "src\\screens\\CommunityContent\\sections\\Communitycontentpage\\Communitycontentpage.jsx"
702702
}
703703
}
704704
},
705705
{
706-
"id": "src\\screens\\CommunityContent\\sections\\Communitycontentpage\\Communitycontentpage.jsx:319:27-to-src\\screens\\CommunityPage\\CommunityPage.jsx",
706+
"id": "src\\screens\\CommunityContent\\sections\\Communitycontentpage\\Communitycontentpage.jsx:325:27-to-src\\screens\\CommunityPage\\CommunityPage.jsx",
707707
"source": "src\\screens\\CommunityContent\\sections\\Communitycontentpage\\Communitycontentpage.jsx",
708708
"target": "src\\screens\\CommunityPage\\CommunityPage.jsx",
709709
"data": {
710710
"viaRoute": "/communitypage",
711711
"trigger": {
712712
"element": "navigate(\"/communitypage\")",
713-
"line": 319,
714-
"endLine": 319,
713+
"line": 325,
714+
"endLine": 325,
715715
"column": 27,
716716
"endColumn": 53,
717717
"sourceFile": "src\\screens\\CommunityContent\\sections\\Communitycontentpage\\Communitycontentpage.jsx"

‎src/components/LoginPopup/FindId/FindId.jsx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ function FindId({ onClose, onSwitchToLogin }) {
2020
let newErrors = {};
2121

2222
if (!isNotEmpty(email)) {
23-
newErrors.email = "이메일을 입력해주세요.";
23+
newErrors.email = "이메일을 입력해주세요.";
2424
} else if (!isEmail(email)) {
25-
newErrors.email = "올바른 이메일 형식이 아닙니다.";
25+
newErrors.email = "올바른 이메일 형식이 아닙니다.";
2626
}
2727

2828
if (!isNotEmpty(birthDate)) {
29-
newErrors.birthDate = "생년월일을 선택해주세요.";
29+
newErrors.birthDate = "생년월일을 선택해주세요.";
3030
}
3131

3232
setErrors(newErrors);
@@ -40,10 +40,10 @@ function FindId({ onClose, onSwitchToLogin }) {
4040
if (result && result.userId) {
4141
setFoundId(result.userId);
4242
} else {
43-
alert("일치하는 정보가 없습니다.");
43+
alert("일치하는 정보가 없습니다.");
4444
}
4545
} catch (error) {
46-
alert("찾기 실패: 서버 오류가 발생했습니다.");
46+
alert("찾기 실패: 서버 오류가 발생했습니다.");
4747
}
4848
};
4949

@@ -66,7 +66,7 @@ function FindId({ onClose, onSwitchToLogin }) {
6666
</button>
6767

6868
<div className="login-popup-header">
69-
<h2 className="login-popup-title">아이디 찾기 성공</h2>
69+
<h2 className="login-popup-title">아이디 찾기 성공</h2>
7070
</div>
7171

7272
<div style={{ padding: "30px 20px", textAlign: "center" }}>
@@ -83,7 +83,7 @@ function FindId({ onClose, onSwitchToLogin }) {
8383
<p
8484
style={{ marginBottom: "10px", color: "#666", fontSize: "16px" }}
8585
>
86-
회원님의 아이디를 찾았습니다!
86+
회원님의 아이디를 찾았습니다!
8787
</p>
8888

8989
<div
@@ -103,7 +103,7 @@ function FindId({ onClose, onSwitchToLogin }) {
103103
className="login-popup-submit-btn"
104104
onClick={onSwitchToLogin}
105105
>
106-
로그인하러 가기
106+
로그인하러 가기
107107
</button>
108108
</div>
109109
</div>
@@ -121,17 +121,17 @@ function FindId({ onClose, onSwitchToLogin }) {
121121
X
122122
</button>
123123
<div className="login-popup-header">
124-
<h2 className="login-popup-title">아이디 찾기</h2>
124+
<h2 className="login-popup-title">아이디 찾기</h2>
125125
</div>
126126

127127
<form className="login-popup-form" onSubmit={handleSubmit}>
128128
<div className="login-popup-input-group">
129129
<label htmlFor="email" className="login-popup-label">
130-
이메일
130+
이메일
131131
</label>
132132
<input
133133
type="email"
134-
placeholder="이메일을 입력하세요"
134+
placeholder="이메일을 입력하세요"
135135
className={`login-popup-input ${
136136
errors.email ? "input-error" : ""
137137
}`}
@@ -148,12 +148,12 @@ function FindId({ onClose, onSwitchToLogin }) {
148148

149149
<div className="login-popup-input-group">
150150
<label htmlFor="birthDate" className="login-popup-label">
151-
생년월일
151+
생년월일
152152
</label>
153153
<input
154154
name="birthDate"
155155
type="date"
156-
placeholder="생년월일 입력"
156+
placeholder="생년월일 입력"
157157
className={`login-popup-input ${
158158
errors.birthDate ? "input-error" : ""
159159
}`}
@@ -167,7 +167,7 @@ function FindId({ onClose, onSwitchToLogin }) {
167167
)}
168168
</div>
169169

170-
<button className="login-popup-submit-btn">아이디 찾기</button>
170+
<button className="login-popup-submit-btn">아이디 찾기</button>
171171
</form>
172172

173173
<div className="login-popup-footer">
@@ -176,7 +176,7 @@ function FindId({ onClose, onSwitchToLogin }) {
176176
className="login-popup-footer-text"
177177
style={{ marginTop: 5, cursor: "pointer" }}
178178
>
179-
로그인으로 돌아가기
179+
로그인으로 돌아가기
180180
</span>
181181
</div>
182182
</div>

‎src/components/LoginPopup/LoginPopup.jsx‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ export const LoginPopup = ({
1818
e.preventDefault();
1919
const result = await login(id, password);
2020
if (result.status === "SUCCESS") {
21-
console.log("?α??? ????");
21+
console.log("로그인 성공");
2222
localStorage.setItem("userId", id);
2323
onClose();
2424
} else if (result.status === "FORCE_PASSWORD_CHANGE") {
25-
console.log("????й?? ?????????.");
25+
console.log("임시비빌번호로 로그인 하셨습니다. 바로 번호 수정해주세요");
2626
setViewMode("changepw");
2727
} else {
28-
alert("?α??? ????: ????? ??й???? ??????????.");
28+
alert("로그인 실패");
2929
}
3030
};
3131

@@ -40,7 +40,7 @@ export const LoginPopup = ({
4040
??
4141
</button>
4242
<div className="login-popup-header">
43-
<h2 className="login-popup-title">????й?? ????</h2>
43+
<h2 className="login-popup-title">임시비밀번호 변경</h2>
4444
</div>
4545
<ChangePassword onSuccess={() => setViewMode("login")} />
4646
</div>
@@ -55,73 +55,71 @@ export const LoginPopup = ({
5555
onClick={(e) => e.stopPropagation()}
5656
>
5757
<button className="login-popup-close" onClick={onClose}>
58-
??
58+
x
5959
</button>
6060

6161
<div className="login-popup-header">
62-
<h2 className="login-popup-title">?α????</h2>
62+
<h2 className="login-popup-title">로그인</h2>
6363
</div>
6464

6565
<form className="login-popup-form" onSubmit={handleLogin}>
6666
<div className="login-popup-input-group">
67-
<label className="login-popup-label">?????????</label>{" "}
67+
<label className="login-popup-label">아이디</label>{" "}
6868
{/* Changed label */}
6969
<input
7070
type="text" // Changed type to email
7171
className="login-popup-input"
7272
value={id} // Changed value to email
7373
onChange={(e) => setId(e.target.value)} // Changed onChange to setId
74-
placeholder="??????????? ???????????????" // Changed placeholder
74+
placeholder="아이디" // Changed placeholder
7575
required
7676
/>
7777
</div>
7878

7979
<div className="login-popup-input-group">
80-
<label className="login-popup-label">????????</label>
80+
<label className="login-popup-label">비밀번호</label>
8181
<input
8282
type="password"
8383
className="login-popup-input"
8484
value={password}
8585
onChange={(e) => setPassword(e.target.value)}
86-
placeholder="?????????? ???????????????"
86+
placeholder="비밀번호"
8787
required
8888
/>
8989
</div>
9090

9191
<button type="submit" className="login-popup-submit-btn">
92-
?α????
92+
로그인
9393
</button>
9494

9595
<div className="login-popup-footer">
96-
<span className="login-popup-footer-text">
97-
??????? ???????????????
98-
</span>
96+
<span className="login-popup-footer-text">계정이 없으신가요??</span>
9997
<button
10098
type="button"
10199
className="login-popup-signup-btn"
102100
onClick={onSwitchToSignup}
103101
>
104-
???????????
102+
회원가입하기
105103
</button>
106104
</div>
107105
<div className="login-popup-footer">
108-
<span className="login-popup-footer-text">???? ???</span>
106+
<span className="login-popup-footer-text">계정찾기</span>
109107
<button
110108
type="button"
111109
className="login-popup-signup-btn"
112110
onClick={() => {
113-
console.log("아이디 찾기 버튼 눌림!"); // 1. 이 로그가 뜨는지 확인
114-
onSwitchToFindId(); // 2. 부모 함수 실행
111+
console.log("아이디 찾기 버튼 눌림!"); // 1. 이 로그가 뜨는지 확인
112+
onSwitchToFindId(); // 2. 부모 함수 실행
115113
}}
116114
>
117-
????????? ???
115+
아이디 찾기
118116
</button>
119117
<button
120118
type="button"
121119
className="login-popup-signup-btn"
122120
onClick={onSwitchToFindPassword}
123121
>
124-
??й?? ???
122+
비밀번호 찾기
125123
</button>
126124
</div>
127125
</form>

0 commit comments

Comments
 (0)