From 943105857cdc1cb2e65e187c72077b279e1986e0 Mon Sep 17 00:00:00 2001
From: Lee-Dongwook <dlehddnr0713@gmail.com>
Date: Sun, 24 Sep 2023 21:26:59 +0900
Subject: [PATCH 1/3] =?UTF-8?q?design(mypage)=20UI=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/MyPage/MyPage.css | 43 ++++++++++++-------------
 client/src/components/MyPage/MyPage.js  |  6 +++-
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/client/src/components/MyPage/MyPage.css b/client/src/components/MyPage/MyPage.css
index 9c2f2e4a..672d79f7 100644
--- a/client/src/components/MyPage/MyPage.css
+++ b/client/src/components/MyPage/MyPage.css
@@ -5,14 +5,26 @@
   padding: 20px;
   position: sticky;
   top: 100px;
-  background-color: #ffffff;
+  background-color: white;
 }
 
-@media screen and (max-width: 600px) {
-  .container {
-    position: static;
-    margin-left: 0;
-    margin-right: 0;
+@media (max-width: 1920px) {
+  .table_n{
+    margin-top: 5%;
+    margin-left: 10%;
+  }
+  .profilecard {
+    width: 750px;
+    height: 600px;
+    border: 1px solid black;
+    border-radius: 5px;
+    padding: 20px;
+    background-color: white;
+  }
+  .Accompany{
+    background-color: azure;
+    height: 300px;
+    overflow-y: auto;
   }
 }
 
@@ -32,26 +44,13 @@
   width: 100%;
 }
 
-.profilecard {
-  width: 750px;
-  height: 600px;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-  padding: 20px;
-  background-color: #f9f9f9;
-}
-
-.content {
-  margin-right: 100%;
-}
-
 .menu-card {
   width: 300px;
-  border: 1px solid #ccc;
+  border: 1px solid black;
   border-radius: 5px;
   padding: 20px;
   margin-left: 10%;
-  background-color: #f9f9f9;
+  background-color: white;
 }
 
 .button-group {
@@ -67,7 +66,7 @@
 .buttonstyle {
   width: 260px;
   height: 50px;
-  background-color: #ffffff;
+  background-color: skyblue;
   border: none;
   border-radius: 5px;
   font-size: 16px;
diff --git a/client/src/components/MyPage/MyPage.js b/client/src/components/MyPage/MyPage.js
index df2a2f1d..ed5ba26b 100644
--- a/client/src/components/MyPage/MyPage.js
+++ b/client/src/components/MyPage/MyPage.js
@@ -475,7 +475,10 @@ function MyPage() {
         <h5>이메일 : {email}</h5>
         <h5>선호태그 : {ranklist} </h5>
         <hr />
-        <h4>평점 : NaN점</h4>
+        <h4>동행 신청 현황</h4>
+        <div className="Accompany">
+
+        </div>
       </div>
     );
   };
@@ -821,6 +824,7 @@ function MyPage() {
           </td>
         </table>
       </div>
+      <br />
       <Footer />
     </div>
   );

From 553a6a1392cf1a5c02a956bc1d1d3fafdaefe376 Mon Sep 17 00:00:00 2001
From: Lee-Dongwook <dlehddnr0713@gmail.com>
Date: Sun, 24 Sep 2023 21:45:26 +0900
Subject: [PATCH 2/3] =?UTF-8?q?design(accompany)=20Mypage=EC=97=90=20?=
 =?UTF-8?q?=EB=8F=99=ED=96=89=20=EC=8B=A0=EC=B2=AD=20=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=ED=95=98=EA=B8=B0=20init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/MyPage/MyPage.css |  7 ++--
 client/src/components/MyPage/MyPage.js  | 43 ++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/client/src/components/MyPage/MyPage.css b/client/src/components/MyPage/MyPage.css
index 672d79f7..bdb75e08 100644
--- a/client/src/components/MyPage/MyPage.css
+++ b/client/src/components/MyPage/MyPage.css
@@ -16,15 +16,14 @@
   .profilecard {
     width: 750px;
     height: 600px;
+    overflow-y: auto;
     border: 1px solid black;
     border-radius: 5px;
     padding: 20px;
     background-color: white;
   }
-  .Accompany{
-    background-color: azure;
-    height: 300px;
-    overflow-y: auto;
+  .profilecard::-webkit-scrollbar{
+    display: none;
   }
 }
 
diff --git a/client/src/components/MyPage/MyPage.js b/client/src/components/MyPage/MyPage.js
index ed5ba26b..6163a0f0 100644
--- a/client/src/components/MyPage/MyPage.js
+++ b/client/src/components/MyPage/MyPage.js
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import { Form, Button, Modal } from "react-bootstrap";
+import { Form, Button, Modal, Card } from "react-bootstrap";
 import Navbar from "../Navbar/Navbar";
 import Footer from "../Footer/Footer";
 import "./MyPage.css";
@@ -19,32 +19,57 @@ axios.default.withCredentials = true;
 
 function MyPage() {
   let token = localStorage.getItem("token");
+  
   const [name, setName] = useState(""); //프로필 이름
+  
   const [gender, setGender] = useState(""); //프로필 성별
+  
   const [email, setEmail] = useState(""); //프로필 이메일
+  
   const [rank, setRank] = useState([]); //프로필 선호 태그
+  
   const [currentPage, setCurrentPage] = useState("profile"); //메뉴 토글
+  
   const [preview, setPreview] = useState([]);
+  
   const [create, setCreate] = useState(0); //생성한 일정 개수
+  
   const [pw, setPw] = useState(""); //현재 패스워드
+  
   const [password, setPassword] = useState(""); // 수정할 패스워드
+  
   const [withdrawPassword, setWithdrawPassword] = useState("");
+  
   const [confirmPassword, setConfirmPassword] = useState(""); //수정할 패스워드 확인
+  
   const [correct, setCorrect] = useState(false); // 비밀번호 일치 여부
+  
   const [posts, setPosts] = useState([]); //페이지마다 띄울 게시판 목록
+  
   const [postNumber, setPostNumber] = useState([]); // 각 목록 번호
+  
   const [postsPerPage, setPostsPerPage] = useState(10); //페이지마다 띄울 게시판 목록 개수
+  
   var [currentNumber, setCurrentNumber] = useState(0); //현재 페이지 번호
+  
   const [totalPage, setTotalPage] = useState(0); //전체 페이지 개수
+  
   const [total, setTotal] = useState(13); //전체 목록 개수
+  
   const [order, setOrder] = useState("기본"); //버튼 정렬 기준
+  
   const [keyword, setKeyword] = useState(""); // 일정 검색어
+  
   const [loading, setLoading] = useState(false);
 
   const [nestedModal, setNestedModal] = useState(false);
+  
   const [toggle, setToggle] = useState(false);
+  
   const [withdrawModal, setWithdrawModal] = useState(false);
 
+  const [accompanyList, setAccompanyList] = useState(["안녕하세요","안녕하세요","안녕하세요","안녕하세요","안녕하세요"]) // 동행 신청 현황
+
   var ranklist = "";
   var size = posts.length;
   const indexOfLast = currentPage * postsPerPage;
@@ -476,10 +501,20 @@ function MyPage() {
         <h5>선호태그 : {ranklist} </h5>
         <hr />
         <h4>동행 신청 현황</h4>
-        <div className="Accompany">
-
+          {accompanyList.map((item,idx) => 
+            <Card key={idx} style={{
+              height: '100px'
+            }} >
+              {item}
+              <Button
+                style={{
+                  width: '50px',
+                  height: '50px'
+                }}
+              >O</Button>
+            </Card>
+          )}
         </div>
-      </div>
     );
   };
 

From 877b71d89af3722b257a62fbc134ebf5934736a8 Mon Sep 17 00:00:00 2001
From: Lee-Dongwook <dlehddnr0713@gmail.com>
Date: Sun, 24 Sep 2023 22:00:04 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix(password)=20Password=20=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/MyPage/MyPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/MyPage/MyPage.js b/client/src/components/MyPage/MyPage.js
index 6163a0f0..6c264ffc 100644
--- a/client/src/components/MyPage/MyPage.js
+++ b/client/src/components/MyPage/MyPage.js
@@ -384,7 +384,7 @@ function MyPage() {
   const handlePasswordButton = (e) => {
 
     const postToServer = {
-      pw: pw
+      pw: password
     }
 
     axios