Merge pull request #225 from ssu-student-union/main

Main

package.json

@@ -3,10 +3,6 @@
   "private": true,
   "version": "0.0.0",
   "type": "module",
-  "packageManager": "[email protected]",
-  "engines": {
-    "node": ">=18"
-  },
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
@@ -80,5 +76,6 @@
     "tailwindcss": "^3.4.3",
     "typescript": "^5.2.2",
     "vite": "^5.2.0"
-  }
+  },
+  "packageManager": "[email protected]+sha512.837566d24eec14ec0f5f1411adb544e892b3454255e61fdef8fd05f3429480102806bac7446bc9daff3896b01ae4b62d00096c7e989f1596f2af10b927532f39"
 }

src/hooks/useCurrentPage.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 
-export function useCurrentPage(initPage: number = 1) {
-  const [currentPage, setCurrentPage] = useState<number>(initPage);
+export function useCurrentPage(initialPage: number = 1) {
+  const [currentPage, setCurrentPage] = useState<number>(initialPage);
 
   const handlePageChange = (page: number) => {
     setCurrentPage(page);

src/pages/layout/headerLayout.tsx

@@ -27,12 +27,12 @@ export function Layout() {
   };
 
   return (
-    <>
+    <div className="flex min-h-screen flex-col">
       <Header state={loginState ? State.Login : State.Logout} onLogout={handleLogout} />
-      <main>
+      <main className="flex-grow">
         <Outlet />
       </main>
       <Footer />
-    </>
+    </div>
   );
 }

src/pages/main/containers/LostArticleSection.tsx

@@ -42,7 +42,7 @@ const LostArticleSection = () => {
   );
 
   return (
-    <section className="w-full">
+    <section>
       <div className="flex items-center">
         <h1 className="text-[2rem] font-bold xs:text-[1.25rem]">분실물 현황</h1>
         <ArrowUpRight

src/pages/notice/hooks/useNoticeToday.ts

@@ -1,24 +1,26 @@
 import { useEffect, useState } from 'react';
 import { useGetBoardPosts } from '@/hooks/useGetBoardPosts';
+import { useNoticeCategory } from './useNoticeCategory';
 import { Post } from '@/types/apis/get';
 import { useRecoilState } from 'recoil';
 import { todayPostCountState } from '@/recoil/atoms/atom';
-import { useMemo } from 'react';
-import { NoticeResponse } from '../types';
 
-export function useTodayPosts(boardCode: string, category: string, subCategory: string) {
+export function useTodayPosts(boardCode: string) {
+  const { category, subCategory } = useNoticeCategory();
+
   const [todayPostCount, setTodayPostCount] = useRecoilState(todayPostCountState(category));
   const [page, setPage] = useState<number>(0);
   const [stopFetching, setStopFetching] = useState<boolean>(false);
-  const { data, isLoading, isError } = useGetBoardPosts<NoticeResponse>({
+
+  const { data, isLoading, isError } = useGetBoardPosts<any>({
     boardCode,
     take: 10,
     page,
     groupCode: category === '중앙' ? '중앙기구' : '단과대학생회',
     memberCode: subCategory === '전체' ? '' : subCategory,
   });
 
-  const posts: Post[] = useMemo(() => data?.data?.postListResDto || [], [data]);
+  const posts: Post[] = data?.data?.postListResDto || [];
 
   const isPostToday = (dateString: string): boolean => {
     const today = new Date();
@@ -66,7 +68,7 @@ export function useTodayPosts(boardCode: string, category: string, subCategory:
     } else {
       setStopFetching(true);
     }
-  }, [posts, category, subCategory, setTodayPostCount]);
+  }, [posts]);
 
   return {
     todayPostCount,

src/pages/notice/page.tsx

@@ -19,7 +19,7 @@ export function NoticePage() {
     category,
     subCategory
   );
-  const { todayPostCount, isLoading: isPostsLoading } = useTodayPosts(boardCode, category, subCategory);
+  const { todayPostCount, isLoading: isPostsLoading } = useTodayPosts(boardCode);
 
   return (
     <>

src/pages/partnership/page.tsx

@@ -44,7 +44,7 @@ export function PartnershipPage() {
     }
   }, [queryClient, refetch]);
 
-  const posts = data?.data.postListResDto || [];
+  const posts = data?.data.postListResDto || []; // 게시물 리스트
   const partnershipCount = useMemo(() => {
     if (isLoading) {
       return 0;

src/template/board/BoardContent.tsx

@@ -5,7 +5,6 @@ import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import BoardContentLoading from './BoardContentLoading';
 import { formatYYYYMMDD } from '@/utils/formatYYYYMMDD';
-import { nameToUrl } from './boardData';
 
 interface BoardContentProps {
   boardName: string;
@@ -118,7 +117,7 @@ export function BoardContent({ boardName, data, isLoading }: BoardContentProps)
           badgeType={status}
           profileName={post.author}
           className="cursor-pointer"
-          onClick={() => navigate(`/${nameToUrl.get(boardName)}/${post.postId}`, { state: { postId: post.postId } })}
+          onClick={() => navigate(`/${boardName}/${post.postId}`, { state: { postId: post.postId } })}
         />
       </div>
     );