Merge branch 'main' into fix/final/merge

src/components/PostPreview/PostHeader.tsx

@@ -7,7 +7,8 @@ import {
   PostDetailInfoContainer,
   UserContainer,
   NameContainer,
-  IdContainer
+  IdContainer,
+  PostInfoContainer
 } from './PostPreview.style';
 import { Link } from '@components/Link';
 import { UserId } from '@components/UserText';

src/pages/layout/components/AlertButton.tsx

@@ -3,7 +3,6 @@ import { useLocation } from 'react-router-dom';
 import { useQuery } from '@tanstack/react-query';
 
 import type { User } from '@/types';
-
 import { getNotifications } from '@apis/notice';
 import useSessionStorage from '@hooks/useSessionStorage';
 import { Icon } from '@components/Icon';
@@ -29,23 +28,21 @@ const AlertButton = ({ handleClickAlert }: AlertButtonProps) => {
   const { token } = userSessionData;
   const [readStatus] = useRecoilState(readAlert);
 
-  const { data, isError } = useQuery({
+  const { data } = useQuery({
     queryKey: ['headerAlert', pathname],
     queryFn: async () => {
       const data = await getNotifications(`Bearer ${token}`);
       return data;
     },
-
+    onError: () => {
+      console.log('헤더 알림 에러!');
+    },
     enabled: token !== '' && !token && pathname !== '/notice',
     refetchInterval: 5000,
     cacheTime: 0,
     staleTime: 0
   });
 
-  if (isError) {
-    console.log('헤더 알림 에러!');
-  }
-
   const alertStatus = data?.filter(({ seen }) => !seen).length > 0;
 
   return (

src/pages/layout/components/SearchBody.style.ts

@@ -7,8 +7,8 @@ export const SearchResultContainer = styled.div`
   position: absolute;
   top: 50px;
   left: 0;
-  z-index: 1;
   overflow-y: scroll;
+  z-index: 100;
 `;
 
 export const SearchResult = styled.div``;

src/pages/notice/Notice.tsx

@@ -1,13 +1,14 @@
 import { useState } from 'react';
 import { useQuery } from '@tanstack/react-query';
+import { useSetRecoilState } from 'recoil';
 
 import { getNotifications, putNotifications } from '@apis/notice';
-import { Button } from '@components/Button';
 import useSessionStorage from '@hooks/useSessionStorage';
-import { User } from '@/types/User';
-import { Notification } from '@/types/Notification';
+import { Button } from '@components/Button';
 import NoticeList from './components/NoticeList/NoticeList';
 import { NoticePage, Header, ReadButtonContainer } from './Notice.style';
+import { readAlert } from './states/readAlert';
+import { User, Notification } from '@/types';
 
 const Notice = () => {
   const [list, setList] = useState([]);
@@ -19,11 +20,15 @@ const Notice = () => {
     }
   );
 
+  const setReadStatus = useSetRecoilState(readAlert);
+
   const fetchNotifications = async () => {
     const res = await getNotifications(`Bearer ${userSessionData.token}`).then(
       (res) => res.filter((item: Notification) => !item.seen)
     );
+    setReadStatus(res.length > 0);
     setList(res);
+
     return res;
   };
 

src/pages/postDetail/components/PostContent.tsx

@@ -19,6 +19,7 @@ import { deletePost, putPost } from '@apis/posts';
 import { Button } from '@components/Button';
 import { Confirm } from '@components/Confirm';
 import { appendFormData, purifyContent } from '@pages/posting/utils';
+import PostHeader from '@components/PostPreview/PostHeader';
 
 interface PostContentProps {
   author: User;