Merge pull request #108 from JaeHeon-Kim/test2

Test2
codestates · May 6, 2021 · a5771ea · a5771ea
2 parents ee463fd + d926e3a
commit a5771ea
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 46 deletions.
diff --git a/src/GamePages/InGame.js b/src/GamePages/InGame.js
@@ -179,6 +179,8 @@ export default function InGame({ accessToken, isLogIn, loginCheck, userInfo }) {
 
   return (
     <>
+      <BackBtn />
+
       <div className="justBox"></div>
       <div className="GameWindow">
         <div className="canvasBox">
@@ -219,7 +221,6 @@ export default function InGame({ accessToken, isLogIn, loginCheck, userInfo }) {
 
         <div className="startOrQuitBtns">
           <GameStartBtn isInGame={isInGame} handleGameStart={handleGameStart} />
-          <BackBtn />
         </div>
       </div>
     </>

diff --git a/src/GamePages/components/BackBtn.js b/src/GamePages/components/BackBtn.js
@@ -4,8 +4,10 @@ import { withRouter, useHistory } from 'react-router-dom';
 function BackBtn() {
   const history = useHistory();
   return (
-    <span className="Back">
-      <button onClick={() => history.push('/Waiting')}>대기실</button>
+    <span>
+      <button className="Back" onClick={() => history.push('/Waiting')}>
+        대기실
+      </button>
     </span>
   );
 }

diff --git a/src/GamePages/components/Canvas3.js b/src/GamePages/components/Canvas3.js
@@ -196,12 +196,13 @@ export default function Canvas3() {
           </div>
         </div>
 
-        <div>
-          <Paint
-            handleColorClick={handleColorClick}
-            reset={reset}
-            eraserBtn={eraserBtn}
-          />
+        <div className="Paint">
+          <button className="reset" onClick={reset}>
+            초기화
+          </button>
+          <button className="color white" onClick={eraserBtn}>
+            지우개
+          </button>
         </div>
       </div>
     </>

diff --git a/src/MyPages/MyPage.js b/src/MyPages/MyPage.js
@@ -18,7 +18,7 @@ function MyPage({ accessToken, refreshTokenRequest, userInfo }) {
   const [PhotoNum, setPhotoNum] = useState(0);
   const [nowPhoto, setPhoto] = useState(PhotoData[profile_image]);
   const [text, setText] = useState(null);
-  
+
   // const emailInputValue = (e) => {
   //   setEmail(e.target.value);
   // };
@@ -30,12 +30,12 @@ function MyPage({ accessToken, refreshTokenRequest, userInfo }) {
   // const nickNameInputValue = (e) => {
   //   setNickName(e.target.value);
   // };
-  
+
   const ChangeInputPhoto = function (photo) {
     // e.preventDefault();
     setPhoto(photo);
-    setPhotoNum(PhotoData.indexOf(nowPhoto))
-    console.log(PhotoNum)
+    setPhotoNum(PhotoData.indexOf(nowPhoto));
+    console.log(PhotoNum);
     if (photo !== nowPhoto) {
       openModal();
     }
@@ -57,35 +57,41 @@ function MyPage({ accessToken, refreshTokenRequest, userInfo }) {
     console.log('photobox', isPhotoBoxOpen);
   };
 
-
-  const MyPageSaveData= async (PhotoNum) =>{
-
-    await refreshTokenRequest()
-    const SavePhoto = await axios.post(`http://localhost:4000/mypage/${id}/profile`,
-    {new_profile: PhotoNum},
-    {
-      headers: {
-        Authorization: `Bearer ${accessToken.accessToken}`,
-        'Content-Type': 'application/json',
-      },
-      //withCredentials: true,
-    })
-    const SaveComment = await axios.post(`http://localhost:4000/mypage/${id}/comment`,
-    {Comment: '아니라어민어리ㅏㅁㄴ얼'},
-    {
-      headers: {
-        Authorization: `Bearer ${accessToken.accessToken}`,
-        'Content-Type': 'application/json',
-      },
-      //withCredentials: true,
-    })
-  }
-
-
+  // const MyPageSaveData = async (PhotoNum) => {
+  //   await refreshTokenRequest();
+  //   const SavePhoto = await axios.post(
+  //     `http://localhost:4000/mypage/${id}/profile`,
+  //     { new_profile: PhotoNum },
+  //     {
+  //       headers: {
+  //         Authorization: `Bearer ${accessToken.accessToken}`,
+  //         'Content-Type': 'application/json',
+  //       },
+  //       //withCredentials: true,
+  //     }
+  //   );
+  //   const SaveComment = await axios.post(
+  //     `http://localhost:4000/mypage/${id}/comment`,
+  //     { Comment: '아니라어민어리ㅏㅁㄴ얼' },
+  //     {
+  //       headers: {
+  //         Authorization: `Bearer ${accessToken.accessToken}`,
+  //         'Content-Type': 'application/json',
+  //       },
+  //       //withCredentials: true,
+  //     }
+  //   );
+  // };
 
   return (
     <div>
-      <Header isOpen={isOpen} nowPhoto={nowPhoto} nickname={nickname} PhotoNum={PhotoNum}MyPageSaveData={MyPageSaveData}/>
+      <Header
+        isOpen={isOpen}
+        nowPhoto={nowPhoto}
+        nickname={nickname}
+        PhotoNum={PhotoNum}
+        // MyPageSaveData={MyPageSaveData}
+      />
       <content className="container">
         <div className="pro_search_box">
           <div className="introBox">
@@ -103,9 +109,7 @@ function MyPage({ accessToken, refreshTokenRequest, userInfo }) {
             </div>
             <div className="intro">
               <h1>자기소개</h1>
-              <textarea
-                placeholder={`클릭하여 자신을 소개해 보세요!`}
-              />
+              <textarea placeholder={`클릭하여 자신을 소개해 보세요!`} />
             </div>
           </div>
           <SearchUser />

diff --git a/src/MyPages/components/ExitBtn.js b/src/MyPages/components/ExitBtn.js
@@ -1,13 +1,13 @@
 import React from 'react';
 import { useHistory } from 'react-router-dom';
 
-export default function ExitBtn({ MyPageSaveData,PhotoNum }) {
+export default function ExitBtn({ MyPageSaveData, PhotoNum }) {
   const history = useHistory();
   return (
     <span className="Exit">
       <button
-        onClick={async () => {
-          await MyPageSaveData(PhotoNum)
+        onClick={() => {
+          // MyPageSaveData();
           history.push('/Waiting');
         }}
       >

diff --git a/src/main.css b/src/main.css
@@ -478,7 +478,6 @@ $button-active-blue: #1669f2; */
   display: flex;
   flex-direction: column;
   align-items: center;
-  margin-top: 50px;
 }
 
 .waiting_btns {
@@ -1192,3 +1191,10 @@ canvas {
   color: white;
   top: 10%;
 }
+
+.Back {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 100px;
+}