Merge pull request #138 from KakaoTech-BootCamp-Team-2/dev

🚀 fix:채팅최종최종수정
KakaoTech-BootCamp-Team-2 · Sep 10, 2024 · ee6a60f · ee6a60f
2 parents 6cd25f1 + 1caa95e
commit ee6a60f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 28 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/jsLinters/eslint.xml b/.idea/jsLinters/eslint.xml
diff --git a/src/pages/chat/ChatMain.jsx b/src/pages/chat/ChatMain.jsx
@@ -11,23 +11,13 @@ function ChatMain() {
   const [chatList, setChatList] = useState([])
   const [selectedChatRoom, setSelectedChatRoom] = useState(null);
 
-  const getUsernameFromCookieOrLocalStorage = () => {
-    // 쿠키에서 username 값을 먼저 확인
-    const usernameFromCookie = document.cookie
-        .split("; ")
-        .find((row) => row.startsWith("username="))
-        ?.split("=")[1];
 
-    // 쿠키에 값이 없으면 localStorage에서 가져오기
-    if (usernameFromCookie) {
-      return usernameFromCookie;
-    } else {
-      return localStorage.getItem("username");
-    }
+  const getUsername = () => {
+    const usernameFromLocalStorage = localStorage.getItem('username');
+    return usernameFromLocalStorage || "kakao_3691500201";
   };
-  const nowUser = getUsernameFromCookieOrLocalStorage();
-  console.log('cookie-get:', nowUser);
 
+  const nowUser = getUsername();
 
   useEffect(() => {
     console.log(nowUser,'현재 사용자')

diff --git a/src/pages/chat/ChatRoom.jsx b/src/pages/chat/ChatRoom.jsx
@@ -10,7 +10,14 @@ const ChatRoom = (props) => {
     const { uuid, name } = props;
     const [messages, setMessages] = useState([]);
     const [message, setMessage] = useState("");
-    const currentUsername = localStorage.getItem('username'); // 현재 사용자 설정
+
+    // 현재 사용자 이름 설정 함수
+    const getUsername = () => {
+        const usernameFromLocalStorage = localStorage.getItem('username');
+        return usernameFromLocalStorage || "kakao_3691500201";
+    };
+
+    const currentUsername = getUsername(); // 현재 사용자 이름 설정
     const roomId = uuid;
     const [stompClient, setStompClient] = useState(null); // STOMP 클라이언트 객체 저장
 
@@ -88,11 +95,12 @@ const ChatRoom = (props) => {
             message: message,
         };
 
+        // 서버로 메시지 발행 (전송)
         stompClient.send("/pub/messages", {}, JSON.stringify(chatMessage));
 
         console.log("전송된 메시지:", chatMessage);
 
-        setMessage("");
+        setMessage(""); // 입력창 초기화
     };
 
     return (