diff --git a/src/app/meeting/components/MeetingList.tsx b/src/app/meeting/components/MeetingList.tsx
index d858868..56e0c1a 100644
--- a/src/app/meeting/components/MeetingList.tsx
+++ b/src/app/meeting/components/MeetingList.tsx
@@ -139,125 +139,130 @@ const MeetingList = () => {
{data?.pages[0].content.length === 0 && }
{/* 모임 리스트 웹뷰 */}
-
-
- {data?.pages.map((page, pageIndex) => (
-
- {page.content.map((meeting: SearchMeeting) => {
- return (
-
-
+ {data?.pages.map((page, pageIndex) => (
+
+ {page.content.map((meeting: SearchMeeting) => {
+ return (
+
-
- );
- })}
-
- ))}
-
+ category={translateCategoryNameToKor(categoryStr)}
+ title={meeting.meetingTitle}
+ thumbnailUrl={meeting.thumbnail}
+ location={meeting.location}
+ isLike={meeting.isLike}
+ total={meeting.maxMember}
+ value={meeting.memberCount}
+ likesCount={meeting.likesCount}
+ skills={meeting.meetingSkillArray}
+ >
+
+
+ );
+ })}
+
+ ))}
+
+ )}
{/* 모임 리스트 테블릿뷰 */}
-
- {data?.pages.map((page, pageIndex) => (
-
- {page.content.map((meeting: SearchMeeting) => {
- return (
-
-
+ {data?.pages.map((page, pageIndex) => (
+
+ {page.content.map((meeting: SearchMeeting) => {
+ return (
+
-
- );
- })}
-
- ))}
-
+ category={translateCategoryNameToKor(categoryStr)}
+ title={meeting.meetingTitle}
+ thumbnailUrl={meeting.thumbnail}
+ thumbnailHeight={160}
+ thumbnailWidth={160}
+ location={meeting.location}
+ isLike={meeting.isLike}
+ likesCount={meeting.likesCount}
+ total={meeting.maxMember}
+ value={meeting.memberCount}
+ skills={meeting.meetingSkillArray}
+ >
+
+
+ );
+ })}
+
+ ))}
+
+ )}
{/* 모임 리스트 모바일뷰 */}
-
- {data?.pages.map((page, pageIndex) => (
-
- {page.content.map((meeting: SearchMeeting) => {
- return (
-
-
+ {data?.pages.map((page, pageIndex) => (
+
+ {page.content.map((meeting: SearchMeeting) => {
+ return (
+
-
- );
- })}
-
- ))}
-
+ title={meeting.meetingTitle}
+ thumbnailUrl={meeting.thumbnail}
+ location={meeting.location}
+ isLike={meeting.isLike}
+ likesCount={meeting.likesCount}
+ total={meeting.maxMember}
+ value={meeting.memberCount}
+ skills={meeting.meetingSkillArray}
+ >
+
+
+ );
+ })}
+
+ ))}
+
+ )}
);
};
diff --git a/src/components/common/Header.tsx b/src/components/common/Header.tsx
index 687f1d9..9526b59 100644
--- a/src/components/common/Header.tsx
+++ b/src/components/common/Header.tsx
@@ -3,6 +3,7 @@
import Logo from '@/assets/icon/logo.svg';
import Profile from '@/assets/icon/profile.svg';
import { removeAccessToken } from '@/lib/serverActions';
+import { translateCategoryNameToKor } from '@/util/searchFilter';
import { Menu } from 'lucide-react';
import Image from 'next/image';
import Link from 'next/link';
@@ -52,7 +53,7 @@ const AfterLogin = ({ userInfo }: { userInfo: IUserInfo }) => {
{
value: 'mypage',
label: '마이페이지',
- onSelect: () => router.push('/my-page'),
+ onSelect: () => router.push('/mypage'),
},
{
value: 'logout',
@@ -135,7 +136,7 @@ const MobileAfterLogin = ({ userInfo }: { userInfo: IUserInfo }) => {
마이페이지
@@ -158,7 +159,10 @@ const NavLinks = ({ isMobile }: { isMobile?: boolean }) => {
className={`${!isMobile ? 'hidden items-center text-Cgray700 lg:flex' : 'text-Cgray400'}`}
>
{navigation.map((item) => (
-
+
{
useEffect(() => {
const handleResize = () => {
const width = window.innerWidth;
- if (width < 376) {
+ if (width > 376 && width <= 745) {
setBreakpoint('mobile');
- } else if (width < 745) {
+ } else if (width > 745 && width <= 1020) {
setBreakpoint('tablet');
- } else {
+ } else if (width > 1020) {
setBreakpoint('desktop');
}
};