From dc1ff815329a33353d43e7ccec148c97ec7af2e0 Mon Sep 17 00:00:00 2001 From: LEE <dlwodyd7613@ajou.ac.kr> Date: Fri, 8 Dec 2023 23:07:08 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20UI=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/GoogleLoginButton.js | 10 ++++- frontend/src/css/App.css | 39 ++++++++++++++++++++ frontend/src/css/PostWrite.css | 18 +++++++-- frontend/src/pages/PostWrite.js | 6 +-- 4 files changed, 65 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/GoogleLoginButton.js b/frontend/src/components/GoogleLoginButton.js index 0a8be540..3e5dfe55 100644 --- a/frontend/src/components/GoogleLoginButton.js +++ b/frontend/src/components/GoogleLoginButton.js @@ -12,6 +12,7 @@ import 'moment/locale/ko'; import base64 from 'base-64'; import axios from 'axios'; + axios.defaults.withCredentials = true; const GoogleLoginButton = () => { @@ -27,7 +28,10 @@ const GoogleLoginButton = () => { return ( <GoogleOAuthProvider clientId={clientId}> - <GoogleLogin + <div className="loginForm"> + <p>援ш� 濡쒓렇�몄쑝濡� �쒕퉬�� �ъ슜�섍린</p> + <GoogleLogin + theme = "filled_blue" onSuccess={(res) => { let datas = res.credential.split('.') const obj = JSON.parse(b64DecodeUnicode(datas[1])); @@ -45,7 +49,11 @@ const GoogleLoginButton = () => { console.log(err); }} /> + <h4>臾몄쓽: jhw0714@ajou.ac.kr</h4> + <br></br> + </div> </GoogleOAuthProvider> + ); }; diff --git a/frontend/src/css/App.css b/frontend/src/css/App.css index e295e1d8..ef152d44 100644 --- a/frontend/src/css/App.css +++ b/frontend/src/css/App.css @@ -1,3 +1,17 @@ +@font-face { + font-family: 'JalnanGothic'; + src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_231029@1.1/JalnanGothic.woff') format('woff'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Pretendard-Regular'; + src: url('https://cdn.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff') format('woff'); + font-weight: 400; + font-style: normal; +} + button { background: inherit; border: none; @@ -47,4 +61,29 @@ button:active { .App :not(style) { margin: 10px; +} + +.loginForm{ + width: 19vw; + height: 30vh; + border-radius: 10px; + display: flexbox; + justify-content: center; + align-items: center; + text-align: center; + border: 2px solid grey; +} + +.loginForm p{ + /* background-color: red; */ + font-family: 'JalnanGothic'; + font-size: 14px; + margin: 30px; + +} + +.loginForm h4{ + padding-top: 7vh; + font-family: 'Pretendard-Regular'; + } \ No newline at end of file diff --git a/frontend/src/css/PostWrite.css b/frontend/src/css/PostWrite.css index cedb89e2..1c4847ee 100644 --- a/frontend/src/css/PostWrite.css +++ b/frontend/src/css/PostWrite.css @@ -18,17 +18,17 @@ margin-right: auto; } -#test{ +#keyword{ font-family: 'Pretendard-Regular'; font-size: 20px; - font-weight: 500; + font-weight: 700; } #writeTitle{ font-family: 'JalnanGothic'; font-weight: 700; - font-size: 20px; + font-size: 30px; } #writeContent{ @@ -39,4 +39,14 @@ height: 6.25em; resize: none; -} \ No newline at end of file +} +/* #profileLabel{ + font-family: 'JalnanGothic'; + font-size: 100px; +} + + +#profileImg{ + font-family: 'JalnanGothic'; + font-size: 100px; +} */ \ No newline at end of file diff --git a/frontend/src/pages/PostWrite.js b/frontend/src/pages/PostWrite.js index efc5c007..736e2091 100644 --- a/frontend/src/pages/PostWrite.js +++ b/frontend/src/pages/PostWrite.js @@ -135,7 +135,7 @@ function PostWrite() { <div> <form id='postForm' onSubmit={onSubmit}> <div style={{ display: "flex" }}> - <input id='test' readOnly={true} type="text" placeholder="�μ냼 �ㅼ썙��" value={location.keyword} /> + <input id='keyword' readOnly={true} type="text" placeholder="�μ냼 �ㅼ썙��" value={location.keyword} /> <button type="button" onClick={() => { setLocation({ keyword: "", @@ -163,8 +163,8 @@ function PostWrite() { <div style={{ display: "flex" }}> {imglist} </div> - <label htmlFor="profileImg">�대�吏� �낅줈��</label> - <input style={{ display: "none" }} id="profileImg" type="file" onChange={onImgChange} multiple /> + <label id='profileLabel' htmlFor="profileImg">�대�吏� �낅줈��</label> + <input style={{ display: "none" }} id="profileImg" type="file" onChange={onImgChange} multiple /> </div> <button type="submit">�ъ뒪��!</button> </form> -- GitLab