[feat] delete redundant toast

my-trash-bin · Dec 15, 2023 · b15cf6a · b15cf6a
1 parent e5860df
commit b15cf6a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 28 deletions.
diff --git a/project/frontend/src/components/common/Navbar.tsx b/project/frontend/src/components/common/Navbar.tsx
@@ -3,7 +3,6 @@ import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import InviteModal from '../game/InviteModal';
 import MatchingModal from '../game/MatchingModal';
-import useNotAllowedPong from '../game/notAllowedPong';
 import useNewFriend from '../notification/NewFriendToast';
 import { Notification } from '../notification/Notification';
 import useStore from '../pong/Update';
@@ -22,7 +21,6 @@ const Navbar = () => {
   const socket = getGameSocket();
   const router = useRouter();
   const { setIsPlayer1 } = useStore();
-  const { isOpen, closeToast } = useNotAllowedPong();
   const { message, closeMessage } = useToast();
 
   useEffect(() => {
@@ -37,10 +35,6 @@ const Navbar = () => {
     };
   }, [socket, setIsPlayer1]);
 
-  useEffect(() => {
-    setTimeout(() => closeToast(), 2000);
-  }, [isOpen, closeToast]);
-
   useEffect(() => {
     setTimeout(() => closeMessage(), 2000);
   }, [message, closeMessage]);
@@ -88,7 +82,6 @@ const Navbar = () => {
   return (
     <>
       {message && <div className={css}>{message}</div>}
-      {isOpen && <div className={css}>게임이 시작되지 않았어요!</div>}
       {errorMessage && <div className={css}>{errorMessage}</div>}
       {isNewFriendOpen && (
         <div className={css}>{friendName}님과 친구가 되었습니다!</div>

diff --git a/project/frontend/src/components/game/notAllowedPong.tsx b/project/frontend/src/components/game/notAllowedPong.tsx
diff --git a/project/frontend/src/components/pong/Board.tsx b/project/frontend/src/components/pong/Board.tsx
@@ -2,7 +2,6 @@ import { avatarToUrl } from '@/app/_internal/util/avatarToUrl';
 import Image from 'next/image';
 import { useRouter } from 'next/navigation';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import useNotAllowedPong from '../game/notAllowedPong';
 import usePaddleMovement from './KeyHandle';
 import useStore from './Update';
 import {
@@ -17,6 +16,7 @@ import {
   SMALL_PADDLE_HEIGHT,
 } from './gameConstants';
 import { getGameSocket } from './gameSocket';
+import useToast from '../common/useToast';
 
 const usePaddleHeight = (type: number) => {
   return useMemo(() => {
@@ -69,14 +69,14 @@ function Board() {
     socket.emit('clientReady', socket.id);
   }, [socket]);
 
-  const { OpenToast } = useNotAllowedPong();
+  const { openMessage } = useToast();
 
   useEffect(() => {
     if (isPlayer1 === undefined) {
       router.replace('/game');
-      OpenToast();
+      openMessage('게임이 시작되지 않았어요!');
     }
-  }, [isPlayer1, router, OpenToast]);
+  }, [isPlayer1, router, openMessage]);
 
   /* --------------------- 게임 중단 --------------------- */
   const handleDisconnect = useCallback(() => {