Merge pull request #119 from capstone-maru/dev

release: v1.0.0
capstone-maru · May 30, 2024 · 3d38eda · 3d38eda
2 parents 32696e6 + 62fb54d
commit 3d38eda
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "maru",
-  "version": "0.11.2",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
     "dev": "next dev",

diff --git a/src/app/globals.scss b/src/app/globals.scss
@@ -1,4 +1,3 @@
-@import url('https://fonts.googleapis.com/css2?family=Baloo+2:[email protected]&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Noto+Sans+KR:[email protected]&display=swap');
 @import url('https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/static/pretendard.min.css');
 

diff --git a/src/app/pages/error-page.tsx b/src/app/pages/error-page.tsx
@@ -29,7 +29,7 @@ const styles = {
 
   title: styled.p`
     color: var(--Main-1, #e15637);
-    font-family: 'Baloo 2';
+    font-family: 'Pretendard';
     font-size: 1.875rem;
     font-style: normal;
     font-weight: 700;

diff --git a/src/app/pages/setting-page.tsx b/src/app/pages/setting-page.tsx
@@ -320,6 +320,34 @@ export function SettingPage({ cardId }: { cardId: number }) {
     history.back();
   };
 
+  useEffect(() => {
+    if (card.data == null) return;
+
+    const { smoking, mateAge, roomSharingOption, options } =
+      card.data.data.myFeatures;
+
+    const temp = JSON.parse(options) as string[];
+
+    setFeatures({
+      smoking,
+      mateAge,
+      roomSharingOption,
+      options:
+        temp == null
+          ? new Set()
+          : temp.reduce<Set<string>>((prev, curr) => {
+              try {
+                if (Array.isArray(JSON.parse(curr))) {
+                  setBudget(curr.slice(1, -1));
+                }
+              } catch {
+                prev.add(curr);
+              }
+              return prev;
+            }, new Set()),
+    });
+  }, [card.data]);
+
   useEffect(() => {
     const originalPush = router.push.bind(router);
     const newPush = (

diff --git a/src/components/FloatingChatting.tsx b/src/components/FloatingChatting.tsx
@@ -13,6 +13,7 @@ import { ChattingRoom } from './chat/ChattingRoom';
 import { useAuthValue, useUserData } from '@/features/auth';
 import { chatOpenState, type GetChatRoomDTO } from '@/features/chat';
 import { useIsMobile } from '@/shared/mobile';
+import { useToast } from '@/features/toast';
 
 const styles = {
   chattingButton: styled.div`
@@ -74,7 +75,7 @@ const styles = {
     background: var(--background, #f7f6f9);
   `,
   title: styled.span`
-    font-family: 'Baloo 2';
+    font-family: 'Pretendard';
     font-size: 1.575rem;
     font-style: normal;
     font-weight: 700;
@@ -140,6 +141,8 @@ interface Message {
 }
 
 function FloatingChattingBox() {
+  const { createToast } = useToast();
+
   const [isChatRoomOpen, setIsChatRoomOpen] = useState<boolean>(false);
   const [chatRooms, setChatRooms] = useState<ChatRoom[]>([]);
   const [message, setMessage] = useState<Message>();
@@ -170,10 +173,15 @@ function FloatingChattingBox() {
           heartbeatOutgoing: 4000,
         });
         setStompClient(stomp);
-        stomp.activate();
 
         stomp.onConnect = () => {
-          console.log('WebSocket 연결이 열렸습니다.');
+          createToast({
+            message: '채팅 연결에 성공했습니다.',
+            option: {
+              duration: 3000,
+            },
+          });
+
           stomp.subscribe(`/roomList/${userId}`, frame => {
             try {
               const newMessage: Message = JSON.parse(frame.body);
@@ -183,8 +191,19 @@ function FloatingChattingBox() {
             }
           });
         };
+
+        stomp.onWebSocketError = () => {
+          createToast({
+            message: '연결에 실패했습니다. 다시 시도합니다.',
+            option: {
+              duration: 3000,
+            },
+          });
+        };
+
+        stomp.activate();
       } catch (error) {
-        console.error('채팅 룸 생성 중 오류가 발생했습니다:', error);
+        console.error('채팅 방 생성 중 오류가 발생했습니다:', error);
       }
     };
 
@@ -197,7 +216,7 @@ function FloatingChattingBox() {
         stompClient.deactivate();
       }
     };
-  }, [auth?.accessToken, userId]);
+  }, [auth?.accessToken]);
 
   useEffect(() => {
     if (data !== undefined) {

diff --git a/src/components/NavigationBar.tsx b/src/components/NavigationBar.tsx
@@ -99,7 +99,7 @@ const styles = {
   `,
   title: styled.h1`
     color: var(--Main-1, #e15637);
-    font-family: 'Baloo 2';
+    font-family: 'Pretendard';
     font-size: 1.875rem;
     font-style: normal;
     font-weight: 700;

diff --git a/src/components/card/OptionSection.tsx b/src/components/card/OptionSection.tsx
@@ -125,7 +125,7 @@ const styles = {
   `,
   value: styled.div`
     display: flex;
-    width: 6.8rem;
+    width: 7rem;
     padding: 0.5rem 1.5rem;
     justify-content: center;
     align-items: center;

diff --git a/src/components/chat/ChattingRoom.tsx b/src/components/chat/ChattingRoom.tsx
@@ -10,6 +10,7 @@ import { SenderMessage } from './SenderMessage';
 
 import { useAuthValue } from '@/features/auth';
 import { useEnterChatRoom, useExitChatRoom } from '@/features/chat';
+import { useToast } from '@/features/toast';
 
 const styles = {
   container: styled.div`
@@ -187,6 +188,8 @@ export function ChattingRoom({
   lastTime: string;
   onRoomClick: React.Dispatch<React.SetStateAction<boolean>>;
 }) {
+  const { createToast } = useToast();
+
   const [messages, setMessages] = useState<Content[]>([]);
   const [inputMessage, setInputMessage] = useState('');
   const [stompClient, setStompClient] = useState<Client | null>(null);
@@ -234,10 +237,15 @@ export function ChattingRoom({
           heartbeatOutgoing: 4000,
         });
         setStompClient(stomp);
-        stomp.activate();
 
         stomp.onConnect = () => {
-          console.log('WebSocket 연결이 열렸습니다.');
+          createToast({
+            message: `[${roomName}] 방 연결에 성공했습니다.`,
+            option: {
+              duration: 3000,
+            },
+          });
+
           stomp.subscribe(`/room/${roomId}`, frame => {
             try {
               setTime(new Date().toISOString());
@@ -249,6 +257,17 @@ export function ChattingRoom({
             }
           });
         };
+
+        stomp.onWebSocketError = () => {
+          createToast({
+            message: '연결에 실패했습니다. 다시 시도합니다.',
+            option: {
+              duration: 3000,
+            },
+          });
+        };
+
+        stomp.activate();
       } catch (error) {
         console.error('채팅 룸 생성 중 오류가 발생했습니다:', error);
       }

diff --git a/src/components/chat/MobileChattingBox.tsx b/src/components/chat/MobileChattingBox.tsx
@@ -36,7 +36,7 @@ const styles = {
     background: var(--background, #f7f6f9);
   `,
   title: styled.span`
-    font-family: 'Baloo 2';
+    font-family: 'Pretendard';
     font-size: 1.575rem;
     font-style: normal;
     font-weight: 700;