Merge pull request #68 from CAU-Capstone-FindIt/develop

Develop
CAU-Capstone-FindIt · Dec 5, 2024 · e087140 · e087140
2 parents ea829dc + 11a8700
commit e087140
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/pages/Detail.jsx b/src/pages/Detail.jsx
@@ -135,11 +135,10 @@ const Detail = () => {
         }
       );
       console.log(response.data);
-      window.location.reload(true);
+      navigate("/find");
       return response;
     } catch (error) {
       console.error("거래 실패:", error);
-
       if (error.response.status === 401) {
         console.log(error.response.status);
         alert("게시글을 등록하려면 로그인해주세요");
@@ -167,11 +166,11 @@ const Detail = () => {
       );
 
       console.log(response.data);
-      window.location.reload(true);
+      // window.location.reload(true);
+      navigate("/lost");
       return response;
     } catch (error) {
       console.error("거래 실패:", error);
-
       if (error.response.status === 401) {
         console.log(error.response.status);
         alert("게시글을 등록하려면 로그인해주세요");
@@ -192,8 +191,10 @@ const Detail = () => {
       }
       let itemId = report.id;
       let receiverId = report.userId;
-      let senderId = localStorage.getItem("userID")
-      navigate("/messageDetail", { state: { itemId, itemType, receiverId, senderId } });
+      let senderId = localStorage.getItem("userID");
+      navigate("/messageDetail", {
+        state: { itemId, itemType, receiverId, senderId },
+      });
     }
   };
 
@@ -239,7 +240,7 @@ const Detail = () => {
                   </LabelBox>
                   <LabelBox>
                     <Label>분류번호 :</Label>
-                    <LabelData>몰라</LabelData>
+                    <LabelData>{report.id}</LabelData>
                   </LabelBox>
                 </div>
               </ContentDetailBox>
@@ -391,6 +392,7 @@ const TitleBox = styled.div`
   width: 100%;
   display: flex;
   justify-content: end;
+  align-items: center;
   @media (max-width: 400px) {
     font-size: 13px;
   }
@@ -431,11 +433,9 @@ const LabelBox = styled.div`
 
 const Label = styled.div`
   font-weight: bold;
-  width: 40%;
 `;
 
 const LabelData = styled.div`
-  width: 60%;
   font-weight: 550;
 `;
 const ShareIconBox = styled.div`

diff --git a/src/pages/mappage/ModalItem.jsx b/src/pages/mappage/ModalItem.jsx
@@ -109,7 +109,6 @@ const CategoryBox = styled.h5`
 `;
 
 const DetailBtn = styled.button`
-  width: 40%;
   padding: 0.5rem 1rem;
   text-align: center;
   border-radius: 10px;

diff --git a/src/pages/userpage/Userpage.jsx b/src/pages/userpage/Userpage.jsx
@@ -55,11 +55,12 @@ const Container = styled.div`
   background-color: white;
   width: 100%;
   max-width: 600px;
-  height: 100vh;
+  // 스크롤 웹전체로 함 100%로 높이 변경
+  height: 100%;
   display: flex;
   flex-direction: column;
   align-items: center;
-  overflow-y: auto;
+  // overflow-y: auto;
 `;
 
 const InnerContainer = styled.div`