Merge pull request #86 from JaeHeon-Kim/all_about_css

logout css and favicons
codestates · May 6, 2021 · dd0482d · dd0482d
2 parents 147052a + 14412a3
commit dd0482d
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 56 deletions.
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/mindcaptor_icon.ico" />
+    <link rel="icon" href="%PUBLIC_URL%/mindcaptor_icon_cat_face_circle2.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta

diff --git a/public/mindcaptor_icon.ico b/public/mindcaptor_icon.ico
diff --git a/public/mindcaptor_icon.png b/public/mindcaptor_icon.png
diff --git a/public/mindcaptor_icon_cat.png b/public/mindcaptor_icon_cat.png
diff --git a/public/mindcaptor_icon_word.ico b/public/mindcaptor_icon_word.ico
diff --git a/src/MyPages/MyPage.js b/src/MyPages/MyPage.js
@@ -8,15 +8,11 @@ import Character2 from '../images/Character2.png';
 import Character3 from '../images/Character3.png';
 import Character4 from '../images/Character4.png';
 
-const axios = require('axios');
-
 function MyPage({ accessToken, isLogIn, loginCheck, userInfo }) {
   const PhotoData = [Character1, Character2, Character3, Character4];
   const [nowPhoto, setPhoto] = useState(Character1);
   const [isOpen, setIsOpen] = useState(false);
   const [isPhotoBoxOpen, setIsPhotoBoxOpen] = useState(false);
-  const { nickname, email, profile_image, comment, id } = userInfo
-
   const ChangeInputPhoto = function (photo) {
     // e.preventDefault();
     setPhoto(photo);
@@ -46,27 +42,9 @@ function MyPage({ accessToken, isLogIn, loginCheck, userInfo }) {
     };
   });
 
-
-  const MyPageSaveData= async () =>{
-    const SavePhoto = await axios.post(`http://localhost:4000/mypage/${id}/profile`,
-    {
-      authorization: accessToken,
-      //new_profile: number
-    },
-    {
-      headers: { 'Content-Type': 'application/json' },
-      Credentials: 'include',
-    }
-
-    )
-  }
-
-
-
-
   return (
     <div>
-      <Header nickname={nickname}isOpen={isOpen} nowPhoto={nowPhoto} MyPageSaveData={MyPageSaveData}/>
+      <Header isOpen={isOpen} nowPhoto={nowPhoto} />
       <content className="container">
         <div className="pro_search_box">
           <div className="introBox">
@@ -75,11 +53,13 @@ function MyPage({ accessToken, isLogIn, loginCheck, userInfo }) {
               <button className="changeProPhoto" onClick={handlePhotoBox}>
                 편집
               </button>
-              <div className="userNickName">닉네임 : {nickname} </div>
+              <div className="userNickName">닉네임 : {userInfo.nickname} </div>
             </div>
             <div className="intro">
               <h1>자기소개</h1>
-              <textarea placeholder={comment===null ? "클릭하여 자기소개를 적어주세요!" : comment} />
+              <textarea
+                placeholder={`안녕하세요, ${userInfo.nickname}입니다.`}
+              />
             </div>
           </div>
           <SearchUser />

diff --git a/src/MyPages/components/Complete.js b/src/MyPages/components/Complete.js
@@ -5,7 +5,7 @@ export default function Complete({ isOpen }) {
   return (
     <span>
       {isOpen ? (
-        <div style={{ opacity: isOpen ? '1' : '0' }} className="changedPro">
+        <div style={{ opacity: isOpen ? '1' : '0' }} className="changedProfile">
           <h3>사진변경이 완료되었습니다.</h3>
         </div>
       ) : null}

diff --git a/src/MyPages/components/ExitBtn.js b/src/MyPages/components/ExitBtn.js
@@ -1,12 +1,17 @@
 import React from 'react';
 import { useHistory } from 'react-router-dom';
 
-export default function ExitBtn({MyPageSaveData}) {
+export default function ExitBtn({ MyPageSaveData }) {
   const history = useHistory();
   return (
     <span className="Exit">
-      <button onClick={() => {history.push('/Waiting')
-      MyPageSaveData()}}>나가기</button>
+      <button
+        onClick={() => {
+          history.push('/Waiting');
+        }}
+      >
+        나가기
+      </button>
     </span>
   );
 }
diff --git a/src/MyPages/components/Header.js b/src/MyPages/components/Header.js
@@ -3,12 +3,12 @@ import React, { useEffect } from 'react';
 import ExitBtn from './ExitBtn';
 import Complete from './Complete';
 
-export default function Header({ isOpen, nowPhoto,nickname,MyPageSaveData }) {
+export default function Header({ isOpen, nowPhoto, nickname, MyPageSaveData }) {
   return (
     <header className="header">
       <h1>{nickname}님의 마이페이지</h1>
       <Complete isOpen={isOpen} />
-      <ExitBtn MyPageSaveData={MyPageSaveData}/>
+      <ExitBtn MyPageSaveData={MyPageSaveData} />
     </header>
   );
 }
diff --git a/src/WaitingPages/Waiting.js b/src/WaitingPages/Waiting.js
@@ -42,7 +42,6 @@ export default function Waiting({
           // Handle forward event
         } else {
           setLocationKeys((keys) => [location.key, ...keys]);
-
           history.push('/Waiting');
         }
       }

diff --git a/src/images/mindcaptor_logo.jpg b/src/images/mindcaptor_logo.jpg
diff --git a/src/images/mindcaptor_logo_welcome.png b/src/images/mindcaptor_logo_welcome.png
diff --git a/src/main.css b/src/main.css
@@ -452,8 +452,10 @@ $button-active-blue: #1669f2; */
 }
 
 .signout_btn {
-  width: 40px;
-  height: 160px;
+  width: 150px;
+  height: 60px;
+  cursor: pointer;
+  border-radius: 100px;
 }
 
 .waiting_box {
@@ -677,17 +679,16 @@ $button-active-blue: #1669f2; */
   width: 200px;
   height: 150px;
   overflow-y: scroll;
-
 }
-.followList::-webkit-scrollbar{
+/* .followList::-webkit-scrollbar {
   width: 10px;
 }
-.followList::-webkit-scrollbar-track{
+.followList::-webkit-scrollbar-track {
   background-color: rgba(0, 0, 0, 0);
 }
-.followList::-webkit-scrollbar-thumb{
+.followList::-webkit-scrollbar-thumb {
   background-color: rgb(0, 0, 0);
-}
+} */
 
 .follower {
   width: 250px;
@@ -701,7 +702,7 @@ $button-active-blue: #1669f2; */
   margin-top: 10px;
 }
 
-.changedPro {
+.changedProfile {
   position: absolute;
   box-sizing: border-box;
   text-align: center;
@@ -711,6 +712,7 @@ $button-active-blue: #1669f2; */
   border-radius: 15px;
   padding: 25px;
   background-color: #77acf1;
+  visibility: 1;
   transition: opacity 1.5s ease;
   font-size: 20px;
   color: white;
@@ -1013,18 +1015,18 @@ canvas {
   height: 60px;
 }
 
-.idCreatedOk{
-    position: absolute;
-    box-sizing: border-box;
-    text-align: center;
-    width: 400px;
-    height: 100px;
-    border: 5px solid #0f4d86;
-    border-radius: 15px;
-    padding: 35px;
-    background-color: #77acf1;
-    transition: opacity 1.5s ease;
-    font-size: 20px;
-    color: white;
-    top: 10%;
-}
+.idCreatedOk {
+  position: absolute;
+  box-sizing: border-box;
+  text-align: center;
+  width: 400px;
+  height: 100px;
+  border: 5px solid #0f4d86;
+  border-radius: 15px;
+  padding: 35px;
+  background-color: #77acf1;
+  transition: opacity 1.5s ease;
+  font-size: 20px;
+  color: white;
+  top: 10%;
+}