Merge pull request #76 from eunji-0623/feature-황은지

Feat: 채팅 팝업 오류 수정
eunji-0623 · Aug 5, 2024 · 60d729b · 60d729b
2 parents ef95244 + 8cee3a8
commit 60d729b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/components/Button/TopButton.tsx b/components/Button/TopButton.tsx
@@ -1,8 +1,11 @@
 import Image from 'next/image';
 import React, { useState, useEffect } from 'react';
+import { useRouter } from 'next/router';
 
 const TopButton = () => {
   const [showButton, setShowButton] = useState(false);
+  const router = useRouter();
+  const isActivityDetailPage = router.pathname.startsWith('/activity-details/');
 
   const scrollToTop = () => {
     window.scroll({
@@ -26,7 +29,13 @@ const TopButton = () => {
   return (
     <>
       {showButton && (
-        <div className="fixed right-[30px] m:right-[14px] bottom-[30px] z-30">
+        <div
+          className="fixed z-30"
+          style={{
+            bottom: isActivityDetailPage ? '70px' : '30px',
+            right: isActivityDetailPage ? '13px' : '30px',
+          }}
+        >
           <button
             onClick={scrollToTop}
             type="button"

diff --git a/components/Popup/ChatPopup.tsx b/components/Popup/ChatPopup.tsx
@@ -32,6 +32,7 @@ function ChatPopup({
 
   const sendMessage = (event: any) => {
     event.preventDefault();
+    if (message === '') return;
     if (isAdmin) {
       socket.emit(
         'sendMessageAdmin',

diff --git a/hooks/useLogout.ts b/hooks/useLogout.ts
@@ -3,6 +3,7 @@ import useLoginState from './useLoginState';
 import { useRecoilState, useResetRecoilState, useSetRecoilState } from 'recoil';
 import { userDefaultState, userState } from '@/states/userState';
 import { useQueryClient } from '@tanstack/react-query';
+import socket from '@/server/server';
 
 export default function useLogout() {
   const { setIsLoggedIn } = useLoginState();
@@ -19,6 +20,7 @@ export default function useLogout() {
     sessionStorage.removeItem('refreshToken');
     sessionStorage.removeItem('userId');
     setIsLoggedIn(false);
+    socket.disconnect();
     route.push('/');
   };