From f149948ea0da574e28d5fb99c506316ab8cc7fd1 Mon Sep 17 00:00:00 2001
From: seoyeonson <eo970721@gmail.com>
Date: Thu, 6 Mar 2025 16:42:47 +0900
Subject: [PATCH 1/4] =?UTF-8?q?feat=20:=20=EC=95=8C=EB=A6=BC=20=EC=9D=BD?=
 =?UTF-8?q?=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20+=20?=
 =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EB=B2=A8=20=ED=91=9C=EC=8B=9C=20(#18)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Home.jsx                           |  94 +++++++--
 src/services/NotiService.js                  |  22 +++
 src/services/WebSocketNotificationService.js | 192 +++++++++++++++++++
 3 files changed, 291 insertions(+), 17 deletions(-)
 create mode 100644 src/services/WebSocketNotificationService.js

diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
index 355eb85..fbb20e8 100644
--- a/src/pages/Home.jsx
+++ b/src/pages/Home.jsx
@@ -7,7 +7,7 @@ import { FaBell } from 'react-icons/fa';
 import './CommitStats.css';
 import '../modals/NotificationModal.css';
 import NotiService from '../services/NotiService';
-import webSocketService from '../services/WebSocketService';
+import webSocketNotificationService from '../services/WebSocketNotificationService';
 
 const Home = () => {
   // 알림 모달
@@ -27,12 +27,29 @@ const Home = () => {
   const [connected, setConnected] = useState(false);  // 웹소켓 연결 상태
   const navigate = useNavigate();
 
-  const toggleModal = () => {
+  const toggleModal = async () => {
     setIsModalOpen(!isModalOpen);
-    if (isModalOpen) {
-      setHasNewNotification(false); // 모달을 열면 새로운 알림 표시 제거
+    if (!isModalOpen) {  // 모달이 열릴 때 (false -> true)
+        try {
+            // 읽지 않은 알림만 필터링
+            const unreadNotifications = notifications.filter(noti => !noti.read);
+            if (unreadNotifications.length > 0) {
+                const unreadIds = unreadNotifications.map(noti => noti.id);
+                await NotiService.markAsRead(unreadIds);
+                
+                // 상태 업데이트: 알림을 읽음으로 표시
+                setNotifications(prev => prev.map(noti => 
+                    unreadIds.includes(noti.id) 
+                        ? { ...noti, read: true }
+                        : noti
+                ));
+            }
+            setHasNewNotification(false);
+        } catch (error) {
+            console.error('Failed to mark notifications as read:', error);
+        }
     }
-  };
+};
 
   // 메시지 목록을 로드하는 함수
   const loadNotis = async () => {
@@ -53,24 +70,39 @@ useEffect(() => {
   loadNotis();
 
   // 웹소켓 연결
-  webSocketService.connect();
+  webSocketNotificationService.connect();
 
   // 연결 상태 변경 이벤트 리스너 등록
-  const unsubscribeFromConnection = webSocketService.onConnectionChange(setConnected);
+  const unsubscribeFromConnection = webSocketNotificationService.onConnectionChange(setConnected);
+
+  // 새로운 알림 메시지 핸들러 등록
+  const unsubscribeFromMessages = webSocketNotificationService.onMessage((newNotification) => {
+    console.log('New notification received:', newNotification);
+    // 새로운 알림을 기존 알림 목록 앞에 추가
+    setNotifications(prev => [newNotification, ...prev]);
+    // 모달이 닫혀있을 때만 새 알림 표시
+    if (!isModalOpen) {
+      setHasNewNotification(true);
+    }
+  });
 
   // 채팅방 구독 시도
   setTimeout(() => {
-      const success = webSocketService.subscribeToNotificationChannel();
+      const success = webSocketNotificationService.subscribeToNotificationChannel();
       console.log('Notis subscription success:', success);
   }, 1000); // 약간의 지연을 두어 연결이 설정될 시간을 줌
 
   // 컴포넌트 언마운트 시 이벤트 리스너 제거 및 구독 해제
-  return () => {
+    return () => {
       if (unsubscribeFromConnection) {
-          unsubscribeFromConnection();
+        unsubscribeFromConnection();
       }
-  };
-}, []);
+      if (unsubscribeFromMessages) {
+        unsubscribeFromMessages();
+      }
+      webSocketNotificationService.disconnect();
+    };
+}, [isModalOpen]); // isModalOpen 의존성 추가
   
   useEffect(() => {
     const fetchCommitData = async () => {
@@ -195,16 +227,43 @@ useEffect(() => {
     }
   };
 
+  const notificationBtnStyle = {
+    position: 'relative',
+    backgroundColor: 'transparent',
+    border: 'none',
+    cursor: 'pointer',
+    alignItems: 'center',
+  };
+
+  const notificationIconStyle = {
+    fontSize: '20px',
+  };
+
+  const notificationBadgeStyle = {
+    position: 'absolute',
+    top: '4px',
+    right: '12px',
+    width: '8px',
+    height: '8px',
+    backgroundColor: '#ef4444',
+    borderRadius: '50%',
+    display: hasNewNotification ? 'block' : 'none',
+  };
+
   return (
     <div className="page-container">
       <div className="header">
         <div className="header-content">
           <span style={{ fontSize: '24px', fontWeight: 'bold' }}>CommitField</span>
           <div className="flex items-center gap-4">
-          <button onClick={toggleModal} className="notification-btn">
-              <FaBell className="notification-icon" />
-              {hasNewNotification && <span className="notification-badge"></span>}
-            </button>
+          <button 
+            onClick={toggleModal} 
+            style={notificationBtnStyle}
+            title={connected ? "알림 연결됨" : "알림 연결 중..."}
+          >
+            <FaBell style={notificationIconStyle} />
+            <span style={notificationBadgeStyle}></span>
+          </button>
             {/* 채팅 버튼 추가 */}
             <button
               onClick={goToChat}
@@ -215,7 +274,8 @@ useEffect(() => {
                 border: 'none',
                 alignItems: 'center',
                 gap: '6px',
-                marginRight: '8px'
+                marginRight: '8px',
+                marginLeft: '8px'
               }}
             >
               {/* <MessageSquare size={18} /> */}
diff --git a/src/services/NotiService.js b/src/services/NotiService.js
index 0145189..412fa8d 100644
--- a/src/services/NotiService.js
+++ b/src/services/NotiService.js
@@ -59,6 +59,28 @@ const NotiService = {
     cache.clearCache();
   },
 
+  markAsRead: async(notificationIds) => {
+    try {
+        const response = await fetch(`${API_BACKEND_URL}/api/notifications/read`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            credentials: 'include',
+            body: JSON.stringify({ notificationIds })
+        });
+
+        if (!response.ok) {
+            throw new Error('Failed to mark notifications as read');
+        }
+
+        return await response.json();
+    } catch (error) {
+        console.error('Error marking notifications as read:', error);
+        throw error;
+    }
+  },
+
   // 알림 조회
   getNotis: async () => {
     try {
diff --git a/src/services/WebSocketNotificationService.js b/src/services/WebSocketNotificationService.js
new file mode 100644
index 0000000..1524ab1
--- /dev/null
+++ b/src/services/WebSocketNotificationService.js
@@ -0,0 +1,192 @@
+import { API_BACKEND_URL } from '../config';
+
+class WebSocketNotificationService {
+  constructor() {
+    this.webSocket = null;
+    this.isConnected = false;
+    this.reconnectAttempts = 0;
+    this.maxReconnectAttempts = 5;
+    this.reconnectTimeout = null;
+    this.messageCallbacks = new Set();
+    this.connectionCallbacks = new Set();
+    this.pendingMessages = [];
+    this.connectionPromise = null;
+  }
+
+  connect() {
+    if (this.connectionPromise) {
+      return this.connectionPromise;
+    }
+
+    this.connectionPromise = new Promise((resolve, reject) => {
+      if (this.isConnected && this.webSocket) {
+        console.log('WebSocket already connected');
+        this.notifyConnectionStatus(true);
+        resolve(true);
+        return;
+      }
+
+      if (this.webSocket) {
+        try {
+          this.webSocket.close();
+        } catch (err) {
+          console.error('Error closing previous connection:', err);
+        }
+      }
+
+      try {
+        this.notifyConnectionStatus(false);
+        const baseUrl = API_BACKEND_URL;
+        const wsProtocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+        const wsBaseUrl = baseUrl.replace(/^https?:/, wsProtocol);
+
+        this.webSocket = new WebSocket(`${wsBaseUrl}/notifications`);
+
+        this.webSocket.onopen = (event) => {
+            console.log('WebSocket Connected:', event);
+            this.isConnected = true;
+            this.reconnectAttempts = 0;
+            this.notifyConnectionStatus(true);
+            
+            // 연결 즉시 알림 채널 구독
+            const subscribed = this.subscribeToNotificationChannel();
+            console.log('Notification subscription success:', subscribed);
+            
+            this.processPendingMessages();
+            resolve(true);
+          };
+
+        this.webSocket.onmessage = (event) => {
+          try {
+            const receivedMessage = JSON.parse(event.data);
+            console.log('Notification received:', receivedMessage);
+            this.messageCallbacks.forEach(callback => callback(receivedMessage));
+          } catch (error) {
+            console.error('Error parsing WebSocket message:', error);
+          }
+        };
+
+        this.webSocket.onerror = (error) => {
+          console.error('WebSocket error:', error);
+          this.notifyConnectionStatus(false);
+          reject(error);
+        };
+
+        this.webSocket.onclose = (event) => {
+          console.log('WebSocket closed:', event);
+          this.isConnected = false;
+          this.notifyConnectionStatus(false);
+          reject(new Error('WebSocket connection closed'));
+
+          this.connectionPromise = null;
+          clearTimeout(this.reconnectTimeout);
+          this.reconnectTimeout = setTimeout(() => {
+            if (this.reconnectAttempts < this.maxReconnectAttempts) {
+              this.reconnectAttempts++;
+              console.log(`Reconnection attempt ${this.reconnectAttempts}`);
+              this.connect();
+            } else {
+              console.error('Max reconnection attempts reached');
+            }
+          }, 3000);
+        };
+      } catch (error) {
+        console.error('Error creating WebSocket connection:', error);
+        this.notifyConnectionStatus(false);
+        reject(error);
+        this.connectionPromise = null;
+        clearTimeout(this.reconnectTimeout);
+        this.reconnectTimeout = setTimeout(() => this.connect(), 5000);
+      }
+    });
+    return this.connectionPromise;
+  }
+
+  onMessage(callback) {
+    this.messageCallbacks.add(callback);
+    return () => this.messageCallbacks.delete(callback);
+  }
+
+    // 알림 채널 구독
+    subscribeToNotificationChannel() {
+        if (!this.webSocket || !this.isConnected) {
+          console.warn('WebSocket is not connected. Unable to subscribe to notifications.');
+          return false;
+        }
+    
+        try {
+          console.log('Subscribing to notification channel...');
+          
+          // WebSocket은 별도의 구독 과정이 필요 없음
+          // 연결 자체가 구독을 의미함
+          if (this.webSocket.readyState === WebSocket.OPEN) {
+            // 구독 요청 메시지 전송
+            this.webSocket.send(JSON.stringify({
+              type: 'SUBSCRIBE',
+              channel: 'notifications'
+            }));
+            
+            console.log('Subscribed to notification channel');
+            return true;
+          }
+    
+          return false;
+        } catch (error) {
+          console.error('Error subscribing to notification channel:', error);
+          return false;
+        }
+      }
+
+  notifyConnectionStatus(isConnected) {
+    this.connectionCallbacks.forEach(callback => callback(isConnected));
+  }
+
+  onConnectionChange(callback) {
+    this.connectionCallbacks.add(callback);
+    callback(this.isConnected);
+    return () => this.connectionCallbacks.delete(callback);
+  }
+
+  processPendingMessages() {
+    if (this.pendingMessages.length > 0) {
+      console.log(`Processing ${this.pendingMessages.length} pending messages`);
+      
+      const messages = [...this.pendingMessages];
+      this.pendingMessages = [];
+      
+      messages.forEach(msg => {
+        try {
+          if (this.webSocket && this.webSocket.readyState === WebSocket.OPEN) {
+            this.webSocket.send(JSON.stringify(msg));
+            console.log('Sent pending message:', msg);
+          } else {
+            // 연결이 아직 준비되지 않은 경우 다시 pending 목록에 추가
+            this.pendingMessages.push(msg);
+          }
+        } catch (err) {
+          console.error('Error sending pending message:', err);
+          // 실패한 메시지는 다시 pending 목록에 추가
+          this.pendingMessages.push(msg);
+        }
+      });
+    }
+  }
+
+  disconnect() {
+    if (this.webSocket) {
+      try {
+        this.webSocket.close();
+        this.isConnected = false;
+        this.notifyConnectionStatus(false);
+        this.pendingMessages = [];
+        this.connectionPromise = null;
+        console.log('WebSocket disconnected');
+      } catch (error) {
+        console.error('Error disconnecting WebSocket:', error);
+      }
+    }
+  }
+}
+
+const WebSocketService = new WebSocketNotificationService();
+export default WebSocketService;
\ No newline at end of file

From 46f1197c627aa5664049031947e5dc149d6f0412 Mon Sep 17 00:00:00 2001
From: seoyeonson <eo970721@gmail.com>
Date: Fri, 7 Mar 2025 11:35:14 +0900
Subject: [PATCH 2/4] =?UTF-8?q?feat=20:=20=EC=95=8C=EB=A6=BC=20=EC=9D=BD?=
 =?UTF-8?q?=EC=9D=8C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20=20(#18)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Home.jsx                           | 87 ++++++++++++--------
 src/services/WebSocketNotificationService.js | 37 ++++-----
 2 files changed, 69 insertions(+), 55 deletions(-)

diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
index fbb20e8..9ffbef6 100644
--- a/src/pages/Home.jsx
+++ b/src/pages/Home.jsx
@@ -43,8 +43,8 @@ const Home = () => {
                         ? { ...noti, read: true }
                         : noti
                 ));
+                setHasNewNotification(false); // 모든 알림을 읽음으로 표시했으므로 빨간 점 제거
             }
-            setHasNewNotification(false);
         } catch (error) {
             console.error('Failed to mark notifications as read:', error);
         }
@@ -58,6 +58,11 @@ const Home = () => {
         const response = await NotiService.getNotis();
         console.log('Noti response:', response);
         setNotifications(response.data);
+        
+        // 읽지 않은 알림이 있는지 확인
+        const hasUnread = response.data.some(noti => !noti.read);
+        setHasNewNotification(hasUnread);
+        
         setLoading(false);
     } catch (err) {
         console.error('Error loading Noti:', err);
@@ -67,42 +72,52 @@ const Home = () => {
 };
 
 useEffect(() => {
-  loadNotis();
-
-  // 웹소켓 연결
-  webSocketNotificationService.connect();
-
-  // 연결 상태 변경 이벤트 리스너 등록
-  const unsubscribeFromConnection = webSocketNotificationService.onConnectionChange(setConnected);
-
-  // 새로운 알림 메시지 핸들러 등록
-  const unsubscribeFromMessages = webSocketNotificationService.onMessage((newNotification) => {
-    console.log('New notification received:', newNotification);
-    // 새로운 알림을 기존 알림 목록 앞에 추가
-    setNotifications(prev => [newNotification, ...prev]);
-    // 모달이 닫혀있을 때만 새 알림 표시
-    if (!isModalOpen) {
-      setHasNewNotification(true);
-    }
-  });
-
-  // 채팅방 구독 시도
-  setTimeout(() => {
-      const success = webSocketNotificationService.subscribeToNotificationChannel();
-      console.log('Notis subscription success:', success);
-  }, 1000); // 약간의 지연을 두어 연결이 설정될 시간을 줌
-
-  // 컴포넌트 언마운트 시 이벤트 리스너 제거 및 구독 해제
-    return () => {
-      if (unsubscribeFromConnection) {
-        unsubscribeFromConnection();
-      }
-      if (unsubscribeFromMessages) {
-        unsubscribeFromMessages();
+  const setupWebSocket = async () => {
+      try {
+          await webSocketNotificationService.connect();
+
+          // 연결 상태 변경 이벤트 리스너 등록
+          const unsubscribeFromConnection = webSocketNotificationService.onConnectionChange((isConnected) => {
+              console.log('WebSocket connection status:', isConnected);
+              setConnected(isConnected);
+              
+              // 연결되면 바로 구독 시도
+              if (isConnected) {
+                  const success = webSocketNotificationService.subscribeToNotificationChannel();
+                  console.log('Notification subscription success:', success);
+              }
+          });
+
+          // 새로운 알림 메시지 핸들러 등록
+          const unsubscribeFromMessages = webSocketNotificationService.onMessage((newNotification) => {
+              console.log('New notification received:', newNotification);
+              
+              // 새로운 알림을 상태에 추가
+              setNotifications(prev => [{
+                  ...newNotification,
+                  read: false
+              }, ...prev]);
+              
+              // 새 알림 표시
+              setHasNewNotification(true);
+          });
+
+          // 초기 알림 데이터 로드
+          await loadNotis();
+
+          // 컴포넌트 언마운트 시 정리
+          return () => {
+              unsubscribeFromConnection();
+              unsubscribeFromMessages();
+              webSocketNotificationService.disconnect();
+          };
+      } catch (error) {
+          console.error('Error setting up WebSocket:', error);
       }
-      webSocketNotificationService.disconnect();
-    };
-}, [isModalOpen]); // isModalOpen 의존성 추가
+  };
+
+  setupWebSocket();
+}, []);
   
   useEffect(() => {
     const fetchCommitData = async () => {
diff --git a/src/services/WebSocketNotificationService.js b/src/services/WebSocketNotificationService.js
index 1524ab1..98a4a03 100644
--- a/src/services/WebSocketNotificationService.js
+++ b/src/services/WebSocketNotificationService.js
@@ -110,32 +110,31 @@ class WebSocketNotificationService {
     // 알림 채널 구독
     subscribeToNotificationChannel() {
         if (!this.webSocket || !this.isConnected) {
-          console.warn('WebSocket is not connected. Unable to subscribe to notifications.');
-          return false;
+            console.warn('WebSocket is not connected. Unable to subscribe to notifications.');
+            return false;
         }
     
         try {
-          console.log('Subscribing to notification channel...');
-          
-          // WebSocket은 별도의 구독 과정이 필요 없음
-          // 연결 자체가 구독을 의미함
-          if (this.webSocket.readyState === WebSocket.OPEN) {
-            // 구독 요청 메시지 전송
-            this.webSocket.send(JSON.stringify({
-              type: 'SUBSCRIBE',
-              channel: 'notifications'
-            }));
+            console.log('Subscribing to notification channel...');
             
-            console.log('Subscribed to notification channel');
-            return true;
-          }
+            if (this.webSocket.readyState === WebSocket.OPEN) {
+                // 구독 요청 메시지 전송
+                this.webSocket.send(JSON.stringify({
+                    type: 'SUBSCRIBE',
+                    channel: 'notifications'
+                }));
+                
+                // 연결 성공 로그
+                console.log('Successfully subscribed to notification channel');
+                return true;
+            }
     
-          return false;
+            return false;
         } catch (error) {
-          console.error('Error subscribing to notification channel:', error);
-          return false;
+            console.error('Error subscribing to notification channel:', error);
+            return false;
         }
-      }
+    }
 
   notifyConnectionStatus(isConnected) {
     this.connectionCallbacks.forEach(callback => callback(isConnected));

From afbec94db4d030b0a309cd4ea964c451e2c3edb2 Mon Sep 17 00:00:00 2001
From: baeksunghyun <ces0135@naver.com>
Date: Fri, 7 Mar 2025 11:52:42 +0900
Subject: [PATCH 3/4] =?UTF-8?q?Fix:=20Pet=20=EB=94=94=EC=9E=90=EC=9D=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Profile.jsx | 199 +++++++++++++++++++++-----
 src/pages/profile.css | 316 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 433 insertions(+), 82 deletions(-)

diff --git a/src/pages/Profile.jsx b/src/pages/Profile.jsx
index a4561f3..ca113fa 100644
--- a/src/pages/Profile.jsx
+++ b/src/pages/Profile.jsx
@@ -1,14 +1,19 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useRef } from "react";
 import SockJS from "sockjs-client";
 import Stomp from "stompjs";
 
 const Profile = ({ userInfo }) => {
-  const [seasonCommitCount, setSeasonCommitCount] = useState(userInfo.seasonCommitCount);
-  const [petExp, setPetExp] = useState(userInfo.petExp);
+  const [seasonCommitCount, setSeasonCommitCount] = useState(userInfo.seasonCommitCount || 0);
+  const [petExp, setPetExp] = useState(userInfo.petExp || 0);
   const [commitCount, setCommitCount] = useState(0);
   const [client, setClient] = useState(null); // WebSocket 클라이언트 상태
+  const [lastRefreshTime, setLastRefreshTime] = useState(new Date());
+  const [isRefreshing, setIsRefreshing] = useState(false);
+  const refreshTimerRef = useRef(null);
 
   const maxExp = userInfo.petGrow === "EGG" ? 150 : userInfo.petGrow === "HATCH" ? 300 : 300;
+  
+  // 티어 아이콘 매핑
   const tierEmojis = {
     SEED: "🌱",
     SPROUT: "🌿",
@@ -17,15 +22,83 @@ const Profile = ({ userInfo }) => {
     TREE: "🌳",
   };
 
+  // 펫 성장 단계 한글화
+  const petGrowthStages = {
+    EGG: "알",
+    HATCH: "부화",
+    BABY: "아기",
+    ADULT: "성체",
+  };
+
   // 경험치 바 계산
   const progress = (petExp / maxExp) * 100;
 
+  // 프로필 정보 자동 새로고침 함수
+  const refreshProfileData = async () => {
+    setIsRefreshing(true);
+    try {
+      // 실제로는 여기서 API 호출을 통해 최신 데이터를 가져옵니다
+      const response = await fetch("/api/user/info", { 
+        credentials: 'include',
+        headers: {
+          'Cache-Control': 'no-cache'
+        }
+      });
+      
+      if (response.ok) {
+        const data = await response.json();
+        // 새로운 데이터로 상태 업데이트
+        setSeasonCommitCount(data.data.seasonCommitCount || 0);
+        setPetExp(data.data.petExp || 0);
+        // 마지막 갱신 시간 업데이트
+        setLastRefreshTime(new Date());
+      }
+    } catch (error) {
+      console.error("프로필 데이터 새로고침 오류:", error);
+    } finally {
+      setIsRefreshing(false);
+    }
+  };
+
+  // 자동 새로고침 설정 (30초마다)
+  useEffect(() => {
+    refreshTimerRef.current = setInterval(refreshProfileData, 30000);
+    
+    // 컴포넌트 언마운트 시 타이머 정리
+    return () => {
+      if (refreshTimerRef.current) {
+        clearInterval(refreshTimerRef.current);
+      }
+    };
+  }, []);
+
   // userInfo가 변경되면 값 업데이트
   useEffect(() => {
-    setSeasonCommitCount(userInfo.seasonCommitCount);
-    setPetExp(userInfo.petExp);
+    setSeasonCommitCount(userInfo.seasonCommitCount || 0);
+    setPetExp(userInfo.petExp || 0);
+    setLastRefreshTime(new Date());
   }, [userInfo]);
 
+  // 날짜 포맷팅 함수
+  const formatDate = (dateString) => {
+    if (!dateString) return "없음";
+    const date = new Date(dateString);
+    return date.toLocaleDateString('ko-KR', { 
+      year: 'numeric', 
+      month: 'long', 
+      day: 'numeric' 
+    });
+  };
+  
+  // 새로고침 시간 포맷팅 함수
+  const formatRefreshTime = (date) => {
+    return date.toLocaleTimeString('ko-KR', {
+      hour: '2-digit',
+      minute: '2-digit',
+      second: '2-digit'
+    });
+  };
+
   useEffect(() => {
     // userInfo.username이 없으면 WebSocket 연결 안 함
     if (!userInfo.username) {
@@ -75,46 +148,100 @@ const Profile = ({ userInfo }) => {
   }, [userInfo.username]); // username이 변경될 때마다 WebSocket 연결
 
   return (
-    <div className="flex-box">
-      <div className="profile-container">
-        {/* 왼쪽: 펫 이미지 */}
-        <div className="pet-box">
-          <img src={`/pets/${userInfo.petGrow}_0_128.png`} alt="Pet" className="animated-pet" />
+    <div className="profile-container">
+      {/* 왼쪽: 펫 이미지 */}
+      <div className="pet-section">
+        <div className="pet-frame">
+          <img 
+            src={`/pets/${userInfo.petGrow}_0_128.png`} 
+            alt="Pet" 
+            className={`pet-image animated-pet ${isRefreshing ? 'refreshing' : ''}`} 
+          />
+        </div>
+        <div className="pet-stage">
+          {petGrowthStages[userInfo.petGrow] || userInfo.petGrow}
+        </div>
+        {isRefreshing && <div className="refreshing-indicator"></div>}
+      </div>
+
+      {/* 오른쪽: 사용자 정보 및 펫 정보 */}
+      <div className="user-info">
+        {/* 유저 이름과 아바타 */}
+        <div className="user-header">
+          <div className="avatar-container">
+            <img src={userInfo.avatarUrl} alt="User Avatar" />
+          </div>
+          <span className="username">{userInfo.username || "사용자"}</span>
         </div>
 
-        {/* 오른쪽: 사용자 정보 및 펫 정보 */}
-        <div className="info-box">
-          <div>
-            <img src={userInfo.avatarUrl} alt="User Avatar" className="avatar" /> {userInfo.username}
+        {/* 유저 세부 정보 */}
+        <div className="user-details">
+          <div className="detail-item">
+            <span className="detail-icon">📊</span>
+            <span className="detail-text">
+              이번 시즌 커밋: <span className="detail-value">{seasonCommitCount}</span>
+            </span>
+          </div>
+          
+          <div className="detail-item">
+            <span className="detail-icon">🔄</span>
+            <span className="detail-text">
+              업데이트 커밋: <span className="detail-value">{commitCount}</span>
+            </span>
           </div>
-          <div>이번 시즌 커밋 수: {seasonCommitCount}</div>
-          <div>업데이트 커밋 수: {commitCount}</div>
-          <div>티어: {tierEmojis[userInfo.tier] || userInfo.tier} / 마지막 커밋 날짜: {new Date(userInfo.lastCommitted).toLocaleDateString()}</div>
-
-          {/* 펫 정보 */}
-          <div>🐾 펫 정보</div>
-          <div className="exp-bar">
-            <div className="bar">
-              <div style={{ width: "100%", height: "5px", backgroundColor: "#F3F3F3", borderRadius: "2px" }}>
-                <div
-                  style={{
-                    width: `${progress}%`, // 경험치 비율 적용
-                    height: "100%",
-                    backgroundColor: "#FF69B4",
-                    borderRadius: "2px",
-                  }}
-                />
-              </div>
+          
+          <div className="detail-item">
+            <span className="detail-icon">🏆</span>
+            <span className="detail-text">
+              티어: <span className="tier-badge">
+                {tierEmojis[userInfo.tier] || ""} {userInfo.tier || "없음"}
+              </span>
+            </span>
+          </div>
+          
+          <div className="detail-item">
+            <span className="detail-icon">📅</span>
+            <span className="detail-text">
+              마지막 커밋: <span className="detail-value">{formatDate(userInfo.lastCommitted)}</span>
+            </span>
+          </div>
+        </div>
+
+        {/* 펫 정보 */}
+        <div className="pet-info">
+          <div className="pet-title">
+            <span>🐾</span> 펫 정보
+          </div>
+          
+          <div className="exp-bar-container">
+            <div className="exp-bar">
+              <div 
+                className="exp-progress" 
+                style={{ width: `${progress}%` }}
+              ></div>
             </div>
-            <div>
+            <span className="exp-text">
               {petExp} / {maxExp}
-            </div>
+            </span>
+          </div>
+          
+          {/* 새로고침 버튼 및 마지막 새로고침 시간 표시 */}
+          <div className="refresh-info">
+            <button 
+              className="refresh-button" 
+              onClick={refreshProfileData}
+              disabled={isRefreshing}
+            >
+              <span className={`refresh-icon ${isRefreshing ? 'rotating' : ''}`}>🔄</span>
+            </button>
+            <span className="last-refresh-time">
+              {isRefreshing ? '새로고침 중...' : `마지막 업데이트: ${formatRefreshTime(lastRefreshTime)}`}
+            </span>
           </div>
-          <div>성장 단계: {userInfo.petGrow}</div>
         </div>
       </div>
     </div>
   );
 };
 
-export default Profile;
+export default Profile;
\ No newline at end of file
diff --git a/src/pages/profile.css b/src/pages/profile.css
index 6ef84a6..30251bb 100644
--- a/src/pages/profile.css
+++ b/src/pages/profile.css
@@ -1,74 +1,298 @@
-@keyframes breathe {
-  0%, 100% {
-    transform: scaleY(1); /* 원래 크기 */
-  }
-  50% {
-    transform: scaleY(0.8); /* 0.8배로 작아짐 */
-  }
-}
-
-h2 {
-    color: #222222;
+/* Enhanced Profile Styles */
+.profile-container {
+  width: 100%;
+  background-color: white;
+  border-radius: 12px;
+  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+  padding: 24px;
+  margin-bottom: 32px;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  gap: 24px;
+  transition: all 0.3s ease;
 }
 
-
-.animated-pet {
-  animation: breathe 1.5s infinite ease-in-out;
+.profile-container:hover {
+  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.15);
+  transform: translateY(-2px);
 }
 
-.flex-box{
-    width:100%;
-    display: flex;
-    justify-content: center;
+/* Pet section styling */
+.pet-section {
+  position: relative;
+  flex-shrink: 0;
 }
 
-.profile-container {
+.pet-frame {
+  width: 140px;
+  height: 140px;
+  background: linear-gradient(135deg, #f0f9ff 0%, #e1f5fe 100%);
+  border-radius: 70px;
+  padding: 6px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
   display: flex;
+  justify-content: center;
   align-items: center;
-  gap: 20px;
-  padding: 15px;
-  width: 750px;
-  height: 140px;
-  background-color: #fefefe;
-  color: #010101;
-  border: 1px solid #fff;
-  border-radius: 10px;
-  line-height: 1.4;
+  position: relative;
+  overflow: hidden;
 }
 
-.pet-box {
-  width: 128px;
-  height: 128px;
-  border: 1px solid #ff8a9e;
-  background-image: url('/pets/BACK.png');
+.pet-frame::before {
+  content: '';
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  background: linear-gradient(135deg, rgba(255,255,255,0.4) 0%, rgba(255,255,255,0) 50%);
+  border-radius: 70px;
+  z-index: 1;
 }
-.pet-box img {
+
+.pet-image {
   width: 128px;
   height: 128px;
+  object-fit: contain;
+  z-index: 2;
+}
+
+.pet-stage {
+  position: absolute;
+  bottom: -5px;
+  right: -5px;
+  background-color: #ff6b6b;
+  color: white;
+  font-weight: bold;
+  font-size: 14px;
+  padding: 6px 10px;
+  border-radius: 20px;
+  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+  z-index: 3;
 }
 
-.info-box {
+/* User info section styling */
+.user-info {
   flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
 }
 
-.info-box img {
-  width: 32px;
-  height: 32px;
+.user-header {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-bottom: 8px;
 }
-.avatar {
-  width: 100px;
+
+.avatar-container {
+  width: 50px;
+  height: 50px;
   border-radius: 50%;
+  overflow: hidden;
+  border: 3px solid #f0f0f0;
+  box-shadow: 0 3px 8px rgba(0, 0, 0, 0.1);
+}
+
+.avatar-container img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
+.username {
+  font-size: 20px;
+  font-weight: 700;
+  color: #1f2937;
+}
+
+.user-details {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 12px;
+}
+
+.detail-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.detail-icon {
+  width: 20px;
+  height: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 16px;
+  color: #6b7280;
+}
+
+.detail-text {
+  font-size: 14px;
+  color: #4b5563;
+}
+
+.detail-value {
+  font-weight: 600;
+  color: #111827;
+}
+
+/* Pet info section */
+.pet-info {
+  margin-top: 8px;
+  padding-top: 12px;
+  border-top: 1px solid #f3f4f6;
+}
+
+.pet-title {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 16px;
+  font-weight: 600;
+  color: #4b5563;
+  margin-bottom: 8px;
+}
+
+.exp-bar-container {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-top: 8px;
 }
 
 .exp-bar {
+  flex: 1;
+  height: 8px;
+  background-color: #f3f4f6;
+  border-radius: 4px;
+  overflow: hidden;
+  position: relative;
+}
+
+.exp-progress {
+  height: 100%;
+  background: linear-gradient(to right, #3fb27f, #4ade80);
+  border-radius: 4px;
+  transition: width 0.5s ease;
+}
+
+.exp-text {
+  font-size: 14px;
+  font-weight: 600;
+  color: #6b7280;
+  min-width: 70px;
+  text-align: right;
+}
+
+/* Tier badge */
+.tier-badge {
+  display: inline-flex;
+  align-items: center;
+  background-color: #f3f4f6;
+  padding: 4px 10px;
+  border-radius: 16px;
+  font-size: 14px;
+  font-weight: 600;
+}
+
+/* Animation for pet */
+@keyframes float {
+  0%, 100% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(-5px);
+  }
+}
+
+@keyframes rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@keyframes pulse {
+  0% {
+    transform: scale(1);
+    opacity: 0.7;
+  }
+  50% {
+    transform: scale(1.05);
+    opacity: 1;
+  }
+  100% {
+    transform: scale(1);
+    opacity: 0.7;
+  }
+}
+
+.animated-pet {
+  animation: float 3s ease-in-out infinite;
+}
+
+.animated-pet.refreshing {
+  animation: pulse 1s ease-in-out infinite;
+}
+
+/* 새로고침 관련 스타일 */
+.refresh-info {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-top: 8px;
+  font-size: 12px;
+  color: #9ca3af;
+}
+
+.refresh-button {
+  background: none;
+  border: none;
+  cursor: pointer;
+  padding: 4px;
+  border-radius: 50%;
   display: flex;
   align-items: center;
-  gap: 10px;
+  justify-content: center;
+  transition: all 0.2s ease;
+}
+
+.refresh-button:hover {
+  background-color: #f3f4f6;
+}
+
+.refresh-button:disabled {
+  cursor: not-allowed;
+  opacity: 0.7;
 }
 
-.bar {
-    width: 200px;
-    display: flex;
-    align-items: center;
-    height: 30px;
+.refresh-icon {
+  font-size: 14px;
+  display: inline-block;
 }
+
+.refresh-icon.rotating {
+  animation: rotate 1s linear infinite;
+}
+
+.last-refresh-time {
+  font-size: 11px;
+  color: #9ca3af;
+}
+
+/* 새로고침 진행 중 표시 */
+.refreshing-indicator {
+  position: absolute;
+  top: -5px;
+  right: -5px;
+  width: 14px;
+  height: 14px;
+  border-radius: 50%;
+  background-color: #3b82f6;
+  box-shadow: 0 0 0 2px white;
+  z-index: 10;
+  animation: pulse 1s infinite ease-in-out;
+}
\ No newline at end of file

From 5af9d14e39dad858df62a9d10ace417040788076 Mon Sep 17 00:00:00 2001
From: whale22 <realwhale64@naver.com>
Date: Fri, 7 Mar 2025 12:06:00 +0900
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20stash=20=EC=A0=84=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Profile.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Profile.jsx b/src/pages/Profile.jsx
index ca113fa..f8eed47 100644
--- a/src/pages/Profile.jsx
+++ b/src/pages/Profile.jsx
@@ -27,7 +27,7 @@ const Profile = ({ userInfo }) => {
     EGG: "알",
     HATCH: "부화",
     BABY: "아기",
-    ADULT: "성체",
+    GROWN: "성체",
   };
 
   // 경험치 바 계산
@@ -48,8 +48,8 @@ const Profile = ({ userInfo }) => {
       if (response.ok) {
         const data = await response.json();
         // 새로운 데이터로 상태 업데이트
-        setSeasonCommitCount(data.data.seasonCommitCount || 0);
-        setPetExp(data.data.petExp || 0);
+        setSeasonCommitCount(userInfo.seasonCommitCount || 0);
+        setPetExp(userInfo.petExp || 0);
         // 마지막 갱신 시간 업데이트
         setLastRefreshTime(new Date());
       }