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

Develop
CAU-Capstone-FindIt · Dec 5, 2024 · 12a2d17 · 12a2d17
2 parents dd3ce91 + 3610e4d
commit 12a2d17
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 29 deletions.
diff --git a/src/pages/Nav.jsx b/src/pages/Nav.jsx
@@ -70,7 +70,7 @@ const Container = styled.div`
   bottom: 0;
   width: 100%;
   max-width: 600px;
-  max-height: 600px;
+  max-height: 70px;
   // height: 8vh; // 네비게이션 바의 높이를 화면 비율에 맞춰 설정 (전체 화면의 10%)
   height: 70px; // 네비게이션 바의 높이를 화면 비율에 맞춰 설정 (전체 화면의 10%)
   border-top: solid 1px #d6d6d6;

diff --git a/src/pages/userpage/MessageDetail.jsx b/src/pages/userpage/MessageDetail.jsx
@@ -65,6 +65,24 @@ const MessageDetail = () => {
 
   const [newMessage, setNewMessage] = useState("");
 
+  // const handleSendMessage = async() => {
+  //   console.log(itemId, itemType, receiverId, newMessage)
+  //   //let newReceiverId = senderId;
+  //   let userA
+  //   if(localStorage.getItem("userID") == localStorage.getItem("localReceiverId")){
+  //     userA = localStorage.getItem("localSenderId")
+  //   }else{
+  //     userA = localStorage.getItem("localReceiverId")
+  //   }
+  //   const response = await sendMessage(itemId, itemType, userA, newMessage)
+  //   //console.log(response)
+  //   window.location.reload();
+  // };
+
+  const handleInputChange = (e) => {
+    setNewMessage(e.target.value);
+  };
+
   const fetchMessages = async () => {
     try {
       const response = await getMessage(
@@ -78,10 +96,8 @@ const MessageDetail = () => {
         timestamp: `${msg.timestamp.slice(0, 10)} ${msg.timestamp.slice(11, 16)}`,
         message: msg.message,
       }));
-      // 상태가 변경된 경우만 업데이트
-      if (JSON.stringify(messages) !== JSON.stringify(formattedMessages)) {
         setMessages(formattedMessages);
-      }
+
     } catch (error) {
       console.error(error);
     }
@@ -95,7 +111,7 @@ const MessageDetail = () => {
     }, 2000);
 
     return () => clearInterval(interval); // 컴포넌트 언마운트 시 interval 제거
-  }, []);
+  }, [messages]);
 
   const handleSendMessage = async () => {
     let userA = localStorage.getItem("userID") === localStorage.getItem("localReceiverId")
@@ -111,33 +127,15 @@ const MessageDetail = () => {
     }
   };
 
-  // const handleSendMessage = async() => {
-  //   console.log(itemId, itemType, receiverId, newMessage)
-  //   //let newReceiverId = senderId;
-  //   let userA
-  //   if(localStorage.getItem("userID") == localStorage.getItem("localReceiverId")){
-  //     userA = localStorage.getItem("localSenderId")
-  //   }else{
-  //     userA = localStorage.getItem("localReceiverId")
-  //   }
-  //   const response = await sendMessage(itemId, itemType, userA, newMessage)
-  //   //console.log(response)
-  //   window.location.reload();
 
+  // const handleKeyDown = (e) => {
+  //   if (e.key === "Enter") {
+  //     e.preventDefault();
+  //     handleSendMessage();
+  //     window.location.reload();
+  //   }
   // };
 
-  const handleInputChange = (e) => {
-    setNewMessage(e.target.value);
-  };
-
-  const handleKeyDown = (e) => {
-    if (e.key === "Enter") {
-      e.preventDefault();
-      handleSendMessage();
-      //window.location.reload();
-    }
-  };
-
   const formatMessage = (message)=>{
     const newMessage = message.slice(12,-2)
     return newMessage