Merge pull request #27 from SoluxProject/feature/#26

마이페이지 내비바 수정
SoluxProject · Aug 18, 2021 · 5d72dab · 5d72dab
2 parents 76c6247 + 328bc61
commit 5d72dab
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/src/component/EditMyPage.js b/src/component/EditMyPage.js
@@ -86,7 +86,7 @@ export default function EditMyPage({location}){
     return(
         <div className="EditMyPage">
 
-            <MyPageNavbar></MyPageNavbar>
+            <MyPageNavbar page="editmypage"></MyPageNavbar>
             <div className="EditMyPageMainContent">
             <div className="EditMyPageTitle">
                     <h1>회원정보 수정</h1>

diff --git a/src/component/ExamDday.js b/src/component/ExamDday.js
@@ -131,7 +131,7 @@ export default function ExamDday({location}){
     return(
     <div className="wrapper">
         <div className="MyPageNavbar">
-            <MyPageNavbar></MyPageNavbar>
+            <MyPageNavbar page="examdday"></MyPageNavbar>
         </div>
         <div className="ExamDday">
             <div className="ExamDdayHeadBlock">

diff --git a/src/component/MyPage.js b/src/component/MyPage.js
@@ -3,6 +3,7 @@ import Navbr from "./Navbar";
 import React , {useState, useEffect} from 'react';
 import Axios from 'axios';
 import {Link} from 'react-router-dom';
+import MyPageNavbar from "./MyPageNavbar";
 
 export default function MyPage(){
     const [user,setUser]=useState([]);
@@ -18,7 +19,7 @@ export default function MyPage(){
     return(
         <div className="MyPage">
             <div className="MyPageNavbar">
-                    <Navbr page="MyPage"></Navbr>
+                    <MyPageNavbar page="mypage"></MyPageNavbar>
             </div>
             <div className="MyPageContent">
                 <div className="MyPageTitle">

diff --git a/src/component/MyPageNavbar.js b/src/component/MyPageNavbar.js
@@ -3,14 +3,28 @@ import { BsChevronDoubleLeft } from 'react-icons/bs';
 import { Link } from 'react-router-dom';
 import '../Navbar.css';
 
-export default function MyPageNavbar(){
+export default function MyPageNavbar(props){
+    const thisPage = props.page;
 
     return(
         <div className="nav-bar">
                 <div className="menu-toggle">
-                    <Link to="/mypage">
+                {(thisPage === "mypage") &&
+                    (
+                        <Link to="/">
                         <BsChevronDoubleLeft style={{color: 'white', width: '1.5rem', height: '1.5rem'}} />
-                    </Link>
+                        </Link>
+                    )
+
+                }
+                {(thisPage !== "mypage") &&
+                    (
+                        <Link to="/mypage">
+                        <BsChevronDoubleLeft style={{color: 'white', width: '1.5rem', height: '1.5rem'}} />
+                        </Link>
+                    )
+
+                }
                 </div>
 
             </div>

diff --git a/src/component/MyTime.js b/src/component/MyTime.js
@@ -51,7 +51,7 @@ export default function MyTime ({location}){
     return(
         <div className="MyTime">
             <div className="MyPageNavbar">
-            <MyPageNavbar></MyPageNavbar>
+            <MyPageNavbar page="mytime"></MyPageNavbar>
             </div>
             <div className="MyTimeTitle">나의 공부 시간</div>
             <div className="MyTimeMain">