From c2066d80c19543499fc89884ef880737b0925649 Mon Sep 17 00:00:00 2001
From: jiHeeFlee <esder1310@naver.com>
Date: Sun, 2 Feb 2025 22:11:40 +0900
Subject: [PATCH 1/4] =?UTF-8?q?fix=20:=20return=20error=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Post/Chat/index.tsx | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/components/Post/Chat/index.tsx b/src/components/Post/Chat/index.tsx
index 086dc95..5ecb81e 100644
--- a/src/components/Post/Chat/index.tsx
+++ b/src/components/Post/Chat/index.tsx
@@ -22,7 +22,7 @@ const Chat: React.FC = () => {
       brokerURL: WS_URL,
       connectHeaders: {
         Authorization:
-          'Bearer eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6MSwibG9naW5JZCI6InRlc3QxIiwicm9sZSI6WyJVU0VSIl0sImV4cCI6MTczODIxMjE2NiwiaWF0IjoxNzM4MjA4NTY2fQ.q9v5AnowMsn96J4mG_6xD7nJBRoWzPiOkcb2wN8Hgzc',
+          'Bearer eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6MSwibG9naW5JZCI6ImNvZWR1Iiwicm9sZSI6WyJVU0VSIl0sImV4cCI6MTczODM0NTgwMiwiaWF0IjoxNzM4MzQyMjAyfQ.VK-nYG62qOxPnAdvmyPJGBoDV5rH13cvypIuBMH7Pzo"',
       },
       debug: (str) => console.log(str),
       reconnectDelay: 5000,
@@ -57,7 +57,7 @@ const Chat: React.FC = () => {
         `${import.meta.env.VITE_BASE_URL}/api/chat/${roomId}`,
         {
           headers: {
-            Authorization: `Bearer eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6MSwibG9naW5JZCI6InRlc3QxIiwicm9sZSI6WyJVU0VSIl0sImV4cCI6MTczODIxMjE2NiwiaWF0IjoxNzM4MjA4NTY2fQ.q9v5AnowMsn96J4mG_6xD7nJBRoWzPiOkcb2wN8Hgzc`,
+            Authorization: `Bearer eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6MSwibG9naW5JZCI6ImNvZWR1Iiwicm9sZSI6WyJVU0VSIl0sImV4cCI6MTczODM0NTgwMiwiaWF0IjoxNzM4MzQyMjAyfQ.VK-nYG62qOxPnAdvmyPJGBoDV5rH13cvypIuBMH7Pzo"`,
             'Content-Type': 'application/json',
           },
         }
@@ -91,7 +91,7 @@ const Chat: React.FC = () => {
         destination: `/send/chat/${roomId}`,
         headers: {
           Authorization:
-            'Bearer eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6MSwibG9naW5JZCI6InRlc3QxIiwicm9sZSI6WyJVU0VSIl0sImV4cCI6MTczODIxMjE2NiwiaWF0IjoxNzM4MjA4NTY2fQ.q9v5AnowMsn96J4mG_6xD7nJBRoWzPiOkcb2wN8Hgzc',
+            'Bearer eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6MSwibG9naW5JZCI6ImNvZWR1Iiwicm9sZSI6WyJVU0VSIl0sImV4cCI6MTczODM0NTgwMiwiaWF0IjoxNzM4MzQyMjAyfQ.VK-nYG62qOxPnAdvmyPJGBoDV5rH13cvypIuBMH7Pzo"',
         },
         body: JSON.stringify({ senderId: 1, content: chat }),
       });
@@ -101,12 +101,30 @@ const Chat: React.FC = () => {
     setChat('');
   };
 
+  // return (
+  //   <Container>
+  //     <ChatSection>
+  //       {chatHistory.map((message, index) => (
+  //         <MessageCard key={index} {...message} />
+  //       ))}
+  //     </ChatSection>
+  //     <InputSection>
+  //       <textarea
+  //         value={chat}
+  //         onChange={handleChange}
+  //         onKeyDown={handleEnterKey}
+  //       />
+  //       <BsArrowUpCircleFill onClick={handleSend} />
+  //     </InputSection>
+  //   </Container>
+  // );
   return (
     <Container>
       <ChatSection>
-        {chatHistory.map((message, index) => (
-          <MessageCard key={index} {...message} />
-        ))}
+        {chatHistory?.map &&
+          chatHistory.map((message, index) => (
+            <MessageCard key={index} {...message} />
+          ))}
       </ChatSection>
       <InputSection>
         <textarea

From 400534baf3eb376e8804ab242a166bbcebdfe8fa Mon Sep 17 00:00:00 2001
From: jiHeeFlee <esder1310@naver.com>
Date: Sun, 2 Feb 2025 22:12:20 +0900
Subject: [PATCH 2/4] =?UTF-8?q?feat=20:=20=EC=9B=B9=EC=86=8C=EC=BC=93=20?=
 =?UTF-8?q?=EC=88=98=EC=8B=A0=20=EA=B5=AC=ED=98=84=20=EC=8B=9C=EB=8F=84?=
 =?UTF-8?q?=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Post/Editor/IdeEditor.tsx | 130 +++++++++++++----------
 1 file changed, 73 insertions(+), 57 deletions(-)

diff --git a/src/components/Post/Editor/IdeEditor.tsx b/src/components/Post/Editor/IdeEditor.tsx
index d89197a..1bf5e09 100644
--- a/src/components/Post/Editor/IdeEditor.tsx
+++ b/src/components/Post/Editor/IdeEditor.tsx
@@ -14,71 +14,44 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
   const [themeLoaded, setThemeLoaded] = useState(false);
   const editorRef = useRef<monaco.editor.IStandaloneCodeEditor | null>(null); // 코드 복사, 저장 : 명시적으로 monaco.editor.IStandaloneCodeEditor 타입 지정
   const stompClientRef = useRef<Client | null>(null); // Websocket 클라이언트
-  const postId = 1;
-  const id= 1
-  const token = 'Bearer eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6MSwibG9naW5JZCI6ImNvZWR1Iiwicm9sZSI6WyJVU0VSIl0sImV4cCI6MTczODMzMTYxNiwiaWF0IjoxNzM4MzI4MDE2fQ.ROqA_UZL-9l8RE_1qU_yKe6VQmzWFz7Erw9urJuRjXU';
+  const postId = 2;
+  const id= 2
+  const token = 'eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6NSwibG9naW5JZCI6ImNvZWR1RkUiLCJyb2xlIjpbIlVTRVIiXSwiZXhwIjoxNzM4NDY3NzYzLCJpYXQiOjE3Mzg0NjQxNjN9.a0P5HJ5RvORW6mOcunuGSH9mIgUIin9QYdIBZHnhm2k';
 
   useEffect(()=>{
-    // JSON 테마 파일 로드 및 Monaco Editor 초기화
-    const loadCustomTheme = async () => {
-      try {
-        const response = await fetch('/monaco-themes/dark.json'); // public 폴더 기준
-        if (!response.ok) {
-          throw new Error(`HTTP error! 테마 로드 안됨!! Status: ${response.status}`);
-        }
-
-        // 'response.json()'의 결과를 CustomTheme 타입으로 캐스팅
-        const customTheme = (await response.json()) as CustomTheme;
-        const monaco = await loader.init(); // Monaco 로더 초기화
-
-        monaco.editor.defineTheme('custom-dark', customTheme); // 커스텀 테마 등록
-        setThemeLoaded(true); // 테마 로드 완료
-      } catch (error) {
-        console.error('Failed to load Monaco theme:', (error as Error).message);
-      }
-    };
-
-    loadCustomTheme();
-
-    if(editorRef.current){
-      editorRef.current.focus(); // 마운트 시 code 창에 자동으로 포커스
-    }
-
-    // Websocket 연결 설정
+    // 1️⃣ Websocket 연결 설정
     stompClientRef.current = new Client({
       brokerURL: // [필수] 연결할 서버 주소 명시
         'ws://ec2-3-36-75-8.ap-northeast-2.compute.amazonaws.com:8080/chatting',
       connectHeaders : { Authorization : token },
-      debug: (str)=> console.log(`[ WebSocket Debug ] : ${str}`),
+      debug: (str)=> console.log(`[ 🔍 WebSocket Debug ] : ${str}`),
       onConnect:()=>{
-        console.log("[ ✅ 성공 ]Connected IDE");
+        console.log("[ ✅ 성공 ] Connected IDE");
 
         // 코드 변경 이벤트 구독
-        // stompClientRef.current?.subscribe(`/ide/edit/${postId}`,(message)=>{
-        //   const receivedData = JSON.parse(message.body);
-        //   console.log(`[📥 수신] 코드 업데이트:`, receivedData);
-        //   if(editorRef.current){
-        //     editorRef.current.setValue(receivedData);
-        //   }
-        // });
-        stompClientRef.current?.subscribe(`/ide/edit/${postId}`, (message) => {
-          try {
+        stompClientRef.current?.subscribe(`/ide/edit/${postId}`,(message)=>{
+          try{
             const receivedData = JSON.parse(message.body);
             console.log(`[📥 수신] 코드 업데이트:`, receivedData);
             if (editorRef.current) {
-              editorRef.current.setValue(receivedData);
+              const currentCode = editorRef.current.getValue();
+
+              // 동일한 코드라면 업데이트 방지
+              if (currentCode === receivedData.newContent) return;
+
+              editorRef.current.setValue(receivedData.newContent);
             }
-          } catch (error) {
-            console.error("❌ JSON 파싱 오류: 서버 응답이 올바르지 않습니다.", message.body);
+          } catch(error){
+            console.error("[ ❌ JSON 파싱 오류 ] 서버 응답이 올바르지 않습니다.", message.body);
           }
         });
 
       },
       onStompError: (frame) => {
-        console.error('[❌ STOMP 오류]', frame);
+        console.error('[ ❌ STOMP 오류 ]', frame);
         if (frame.headers?.message?.includes("Not authenticated")) {
           alert("세션이 만료되었습니다. 다시 로그인해주세요.");
-          // ✅ 로그인 페이지로 리디렉트 가능
+          // 로그인 페이지로 리디렉트 가능
           window.location.href = "/sign-in"; 
         }
       },
@@ -92,6 +65,27 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
 
     stompClientRef.current.activate();
 
+    // 2️⃣ JSON 테마 파일 로드 및 Monaco Editor 초기화
+    const loadCustomTheme = async () => {
+      try {
+        const response = await fetch('/monaco-themes/dark.json'); // public 폴더 기준
+        if (!response.ok) {
+          throw new Error(`[ ❌ HTTP 오류 ] 테마 로드 안됨. Status: ${response.status}`);
+        }
+
+        // 'response.json()'의 결과를 CustomTheme 타입으로 캐스팅
+        const customTheme = (await response.json()) as CustomTheme;
+        const monaco = await loader.init(); // Monaco 로더 초기화
+
+        monaco.editor.defineTheme('custom-dark', customTheme); // 커스텀 테마 등록
+        setThemeLoaded(true); // 테마 로드 완료
+      } catch (error) {
+        console.error('[ ❌ HTTP 오류 ] 테마 로드 안됨 :', (error as Error).message);
+      }
+    };
+
+    loadCustomTheme();
+
     return ()=>{
       stompClientRef.current?.deactivate();
       if (stompClientRef.current) {
@@ -101,6 +95,33 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
     };
   },[]);
 
+  // useEffect(()=>{
+  //   // JSON 테마 파일 로드 및 Monaco Editor 초기화
+  //   const loadCustomTheme = async () => {
+  //     try {
+  //       const response = await fetch('/monaco-themes/dark.json'); // public 폴더 기준
+  //       if (!response.ok) {
+  //         throw new Error(`HTTP error! 테마 로드 안됨!! Status: ${response.status}`);
+  //       }
+
+  //       // 'response.json()'의 결과를 CustomTheme 타입으로 캐스팅
+  //       const customTheme = (await response.json()) as CustomTheme;
+  //       const monaco = await loader.init(); // Monaco 로더 초기화
+
+  //       monaco.editor.defineTheme('custom-dark', customTheme); // 커스텀 테마 등록
+  //       setThemeLoaded(true); // 테마 로드 완료
+  //     } catch (error) {
+  //       console.error('Failed to load Monaco theme:', (error as Error).message);
+  //     }
+  //   };
+
+  //   loadCustomTheme();
+
+  //   if(editorRef.current){
+  //     editorRef.current.focus(); // 마운트 시 code 창에 자동으로 포커스
+  //   }
+  // },[])
+
   if (!themeLoaded) {
     return <div style={{color:'#000'}}>
       코드를 불러오는 중입니다! 잠시만 기다려주세요!
@@ -108,11 +129,14 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
   }
 
   const handleEditorMount = (editor: monaco.editor.IStandaloneCodeEditor) => {
+    editorRef.current = editor;
+
 
     editor.onDidChangeModelContent(()=>{
-      if(!editorRef.current) return;
-      const updateCode = editorRef.current?.getValue() || 'print(\"test\") ';  // 값이 없을 경우 문자열로 설정
-      
+      if(!editorRef.current || !stompClientRef.current) return;
+
+      // 변경된 코드 가져오기
+      const updateCode = editorRef.current.getValue();  
       const messageContent = {
         // Authorization:token,
         // destination:'/send/posts/edit/1',
@@ -124,7 +148,7 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
 
       if (!stompClientRef.current) return;
       if (stompClientRef.current) {
-        stompClientRef.current.publish({
+        stompClientRef.current?.publish({
           destination: `/send/posts/edit/${postId}`,
           headers: { 
             Authorization: token, 
@@ -135,14 +159,6 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
       } else {
         console.warn("⚠️ WebSocket 클라이언트가 아직 초기화되지 않았습니다.");
       }
-      // stompClientRef.current?.publish({
-      //   destination: `/send/posts/edit/${postId}`,
-      //   headers: { 
-      //     Authorization: token, 
-      //     'content-type': 'application/json' 
-      //   },
-      //   body: JSON.stringify(messageContent),
-      // });
     });
 
   };

From 42e7e030b5cae06bcd72f7f0dc996feb95d2834b Mon Sep 17 00:00:00 2001
From: jiHeeFlee <esder1310@naver.com>
Date: Sun, 2 Feb 2025 22:48:53 +0900
Subject: [PATCH 3/4] =?UTF-8?q?fix=20:=20merge=20=EC=A7=84=ED=96=89=20?=
 =?UTF-8?q?=EC=A4=91=20=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0=202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/post/Editor/IdeEditor.tsx | 107 +----------------------
 1 file changed, 1 insertion(+), 106 deletions(-)

diff --git a/src/components/post/Editor/IdeEditor.tsx b/src/components/post/Editor/IdeEditor.tsx
index cb0db61..935d85d 100644
--- a/src/components/post/Editor/IdeEditor.tsx
+++ b/src/components/post/Editor/IdeEditor.tsx
@@ -16,63 +16,20 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
   const [themeLoaded, setThemeLoaded] = useState(false);
   const editorRef = useRef<monaco.editor.IStandaloneCodeEditor | null>(null); // 코드 복사, 저장 : 명시적으로 monaco.editor.IStandaloneCodeEditor 타입 지정
   const stompClientRef = useRef<Client | null>(null); // Websocket 클라이언트
-<<<<<<< HEAD:src/components/Post/Editor/IdeEditor.tsx
-  const postId = 2;
-  const id= 2
-  const token = 'eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6NSwibG9naW5JZCI6ImNvZWR1RkUiLCJyb2xlIjpbIlVTRVIiXSwiZXhwIjoxNzM4NDY3NzYzLCJpYXQiOjE3Mzg0NjQxNjN9.a0P5HJ5RvORW6mOcunuGSH9mIgUIin9QYdIBZHnhm2k';
-
-  useEffect(()=>{
-    // 1️⃣ Websocket 연결 설정
-=======
   const postId = 1;
   const id = 1;
   const token = `Bearer ${localStorage.getItem('accessToken')}`;
 
   useEffect(() => {
-    // JSON 테마 파일 로드 및 Monaco Editor 초기화
-    const loadCustomTheme = async () => {
-      try {
-        const response = await fetch('/monaco-themes/dark.json'); // public 폴더 기준
-        if (!response.ok) {
-          throw new Error(
-            `HTTP error! 테마 로드 안됨!! Status: ${response.status}`
-          );
-        }
-
-        // 'response.json()'의 결과를 CustomTheme 타입으로 캐스팅
-        const customTheme = (await response.json()) as CustomTheme;
-        const monaco = await loader.init(); // Monaco 로더 초기화
-
-        monaco.editor.defineTheme('custom-dark', customTheme); // 커스텀 테마 등록
-        setThemeLoaded(true); // 테마 로드 완료
-      } catch (error) {
-        console.error('Failed to load Monaco theme:', (error as Error).message);
-      }
-    };
-
-    loadCustomTheme();
-
-    if (editorRef.current) {
-      editorRef.current.focus(); // 마운트 시 code 창에 자동으로 포커스
-    }
-
-    // Websocket 연결 설정
->>>>>>> dev:src/components/post/Editor/IdeEditor.tsx
+    // 1️⃣ Websocket 연결 설정
     stompClientRef.current = new Client({
       // [필수] 연결할 서버 주소 명시
       brokerURL:
         'ws://ec2-3-36-75-8.ap-northeast-2.compute.amazonaws.com:8080/chatting',
-<<<<<<< HEAD:src/components/Post/Editor/IdeEditor.tsx
       connectHeaders : { Authorization : token },
       debug: (str)=> console.log(`[ 🔍 WebSocket Debug ] : ${str}`),
       onConnect:()=>{
         console.log("[ ✅ 성공 ] Connected IDE");
-=======
-      connectHeaders: { Authorization: token },
-      debug: (str) => console.log(`[ WebSocket Debug ] : ${str}`),
-      onConnect: () => {
-        console.log('[ ✅ 성공 ]Connected IDE');
->>>>>>> dev:src/components/post/Editor/IdeEditor.tsx
 
         // 코드 변경 이벤트 구독
         stompClientRef.current?.subscribe(`/ide/edit/${postId}`,(message)=>{
@@ -87,33 +44,20 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
 
               editorRef.current.setValue(receivedData.newContent);
             }
-<<<<<<< HEAD:src/components/Post/Editor/IdeEditor.tsx
-          } catch(error){
-            console.error("[ ❌ JSON 파싱 오류 ] 서버 응답이 올바르지 않습니다.", message.body);
-=======
           } catch (error) {
             console.error(
               '❌ JSON 파싱 오류: 서버 응답이 올바르지 않습니다.',
               message.body
             );
->>>>>>> dev:src/components/post/Editor/IdeEditor.tsx
           }
         });
       },
       onStompError: (frame) => {
-<<<<<<< HEAD:src/components/Post/Editor/IdeEditor.tsx
-        console.error('[ ❌ STOMP 오류 ]', frame);
-        if (frame.headers?.message?.includes("Not authenticated")) {
-          alert("세션이 만료되었습니다. 다시 로그인해주세요.");
-          // 로그인 페이지로 리디렉트 가능
-          window.location.href = "/sign-in"; 
-=======
         console.error('[❌ STOMP 오류]', frame);
         if (frame.headers?.message?.includes('Not authenticated')) {
           alert('세션이 만료되었습니다. 다시 로그인해주세요.');
           // ✅ 로그인 페이지로 리디렉트 가능
           window.location.href = '/sign-in';
->>>>>>> dev:src/components/post/Editor/IdeEditor.tsx
         }
       },
       onDisconnect: () => {
@@ -126,7 +70,6 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
 
     stompClientRef.current.activate();
 
-<<<<<<< HEAD:src/components/Post/Editor/IdeEditor.tsx
     // 2️⃣ JSON 테마 파일 로드 및 Monaco Editor 초기화
     const loadCustomTheme = async () => {
       try {
@@ -149,9 +92,6 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
     loadCustomTheme();
 
     return ()=>{
-=======
-    return () => {
->>>>>>> dev:src/components/post/Editor/IdeEditor.tsx
       stompClientRef.current?.deactivate();
       if (stompClientRef.current) {
         console.log('💡 WebSocket 연결 해제');
@@ -160,33 +100,6 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
     };
   }, []);
 
-  // useEffect(()=>{
-  //   // JSON 테마 파일 로드 및 Monaco Editor 초기화
-  //   const loadCustomTheme = async () => {
-  //     try {
-  //       const response = await fetch('/monaco-themes/dark.json'); // public 폴더 기준
-  //       if (!response.ok) {
-  //         throw new Error(`HTTP error! 테마 로드 안됨!! Status: ${response.status}`);
-  //       }
-
-  //       // 'response.json()'의 결과를 CustomTheme 타입으로 캐스팅
-  //       const customTheme = (await response.json()) as CustomTheme;
-  //       const monaco = await loader.init(); // Monaco 로더 초기화
-
-  //       monaco.editor.defineTheme('custom-dark', customTheme); // 커스텀 테마 등록
-  //       setThemeLoaded(true); // 테마 로드 완료
-  //     } catch (error) {
-  //       console.error('Failed to load Monaco theme:', (error as Error).message);
-  //     }
-  //   };
-
-  //   loadCustomTheme();
-
-  //   if(editorRef.current){
-  //     editorRef.current.focus(); // 마운트 시 code 창에 자동으로 포커스
-  //   }
-  // },[])
-
   if (!themeLoaded) {
     return (
       <div style={{ color: '#000' }}>
@@ -196,7 +109,6 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
   }
 
   const handleEditorMount = (editor: monaco.editor.IStandaloneCodeEditor) => {
-<<<<<<< HEAD:src/components/Post/Editor/IdeEditor.tsx
     editorRef.current = editor;
 
 
@@ -205,12 +117,6 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
 
       // 변경된 코드 가져오기
       const updateCode = editorRef.current.getValue();  
-=======
-    editor.onDidChangeModelContent(() => {
-      if (!editorRef.current) return;
-      const updateCode = editorRef.current?.getValue() || 'print(\"test\") '; // 값이 없을 경우 문자열로 설정
-
->>>>>>> dev:src/components/post/Editor/IdeEditor.tsx
       const messageContent = {
         // Authorization:token,
         // destination:'/send/posts/edit/1',
@@ -233,17 +139,6 @@ const IdeEditor: React.FC<IdeEditorProps> = ({
       } else {
         console.warn('⚠️ WebSocket 클라이언트가 아직 초기화되지 않았습니다.');
       }
-<<<<<<< HEAD:src/components/Post/Editor/IdeEditor.tsx
-=======
-      // stompClientRef.current?.publish({
-      //   destination: `/send/posts/edit/${postId}`,
-      //   headers: {
-      //     Authorization: token,
-      //     'content-type': 'application/json'
-      //   },
-      //   body: JSON.stringify(messageContent),
-      // });
->>>>>>> dev:src/components/post/Editor/IdeEditor.tsx
     });
   };
 

From 19319a0f68f2966772a9784e51488b590e455a8a Mon Sep 17 00:00:00 2001
From: jiHeeFlee <esder1310@naver.com>
Date: Sun, 2 Feb 2025 22:50:45 +0900
Subject: [PATCH 4/4] =?UTF-8?q?fix=20:=20merge=20=EC=A7=84=ED=96=89=20?=
 =?UTF-8?q?=EC=A4=91=20=EC=B6=A9=EB=8F=8C=20=ED=95=B4=EA=B2=B0=20-=20chat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/post/Chat/index.tsx | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/src/components/post/Chat/index.tsx b/src/components/post/Chat/index.tsx
index 9d17b98..94b25b3 100644
--- a/src/components/post/Chat/index.tsx
+++ b/src/components/post/Chat/index.tsx
@@ -24,12 +24,7 @@ const Chat: React.FC = () => {
     const client = new Client({
       brokerURL: WS_URL,
       connectHeaders: {
-<<<<<<< HEAD:src/components/Post/Chat/index.tsx
-        Authorization:
-          'Bearer eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6MSwibG9naW5JZCI6ImNvZWR1Iiwicm9sZSI6WyJVU0VSIl0sImV4cCI6MTczODM0NTgwMiwiaWF0IjoxNzM4MzQyMjAyfQ.VK-nYG62qOxPnAdvmyPJGBoDV5rH13cvypIuBMH7Pzo"',
-=======
         Authorization: `Bearer ${token}`,
->>>>>>> dev:src/components/post/Chat/index.tsx
       },
       debug: (str) => console.log(str),
       reconnectDelay: 5000,
@@ -58,26 +53,9 @@ const Chat: React.FC = () => {
     };
   }, []);
 
-<<<<<<< HEAD:src/components/Post/Chat/index.tsx
-  const fetchChatHistory = async () => {
-    try {
-      const response = await axios.get(
-        `${import.meta.env.VITE_BASE_URL}/api/chat/${roomId}`,
-        {
-          headers: {
-            Authorization: `Bearer eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6MSwibG9naW5JZCI6ImNvZWR1Iiwicm9sZSI6WyJVU0VSIl0sImV4cCI6MTczODM0NTgwMiwiaWF0IjoxNzM4MzQyMjAyfQ.VK-nYG62qOxPnAdvmyPJGBoDV5rH13cvypIuBMH7Pzo"`,
-            'Content-Type': 'application/json',
-          },
-        }
-      );
-      setChatHistory(response.data);
-    } catch (err: any) {
-      console.error(err);
-=======
   useEffect(() => {
     if (data) {
       setChatHistory(data);
->>>>>>> dev:src/components/post/Chat/index.tsx
     }
   }, [data]);
 
@@ -103,12 +81,7 @@ const Chat: React.FC = () => {
       stompClient.current.publish({
         destination: `/send/chat/${roomId}`,
         headers: {
-<<<<<<< HEAD:src/components/Post/Chat/index.tsx
-          Authorization:
-            'Bearer eyJhbGciOiJIUzI1NiJ9.eyJtZW1iZXJJZCI6MSwibG9naW5JZCI6ImNvZWR1Iiwicm9sZSI6WyJVU0VSIl0sImV4cCI6MTczODM0NTgwMiwiaWF0IjoxNzM4MzQyMjAyfQ.VK-nYG62qOxPnAdvmyPJGBoDV5rH13cvypIuBMH7Pzo"',
-=======
           Authorization: `Bearer ${token}`,
->>>>>>> dev:src/components/post/Chat/index.tsx
         },
         body: JSON.stringify({ senderId: 1, content: chat }),
       });