diff --git a/public/hobby_cat.png b/public/hobby_cat.png new file mode 100644 index 0000000..d8f5ff5 Binary files /dev/null and b/public/hobby_cat.png differ diff --git a/public/mogakco_cat.png b/public/mogakco_cat.png new file mode 100644 index 0000000..b5d99f0 Binary files /dev/null and b/public/mogakco_cat.png differ diff --git a/public/side-project_cat.png b/public/side-project_cat.png new file mode 100644 index 0000000..88f6e74 Binary files /dev/null and b/public/side-project_cat.png differ diff --git a/src/app/(user-page)/my-meeting/_features/Written.tsx b/src/app/(user-page)/my-meeting/_features/Written.tsx index 4bcf9aa..d5d18c1 100644 --- a/src/app/(user-page)/my-meeting/_features/Written.tsx +++ b/src/app/(user-page)/my-meeting/_features/Written.tsx @@ -62,7 +62,7 @@ const Written = () => { {allComments.map((comment) => (
{/* 데스크탑 */} -
+
handleMoveDetailPage(comment.meetingId, comment.categoryTitle) diff --git a/src/app/meeting/[category]/page.tsx b/src/app/meeting/[category]/page.tsx index adbbfde..f804533 100644 --- a/src/app/meeting/[category]/page.tsx +++ b/src/app/meeting/[category]/page.tsx @@ -55,7 +55,7 @@ async function MeetingListPage({ params }: { params: { category: string } }) { notFound(); } return ( -
+
diff --git a/src/app/meeting/_features/MeetingExtraInfo.tsx b/src/app/meeting/_features/MeetingExtraInfo.tsx index 1752c42..0f28536 100644 --- a/src/app/meeting/_features/MeetingExtraInfo.tsx +++ b/src/app/meeting/_features/MeetingExtraInfo.tsx @@ -1,6 +1,6 @@ -import Profile from '@/assets/icon/profile.svg'; import { Button } from '@/components/ui/Button'; import { getDDay } from '@/util/date'; +import Image from 'next/image'; import React from 'react'; interface MeetingExtraInfoProps { @@ -10,6 +10,7 @@ interface MeetingExtraInfoProps { meetingId: number; variant?: 'desktop' | 'tablet' | 'mobile'; onClick?: () => void; + profilePic: string; } const MeetingExtraInfo = ({ @@ -18,6 +19,7 @@ const MeetingExtraInfo = ({ startDate, variant = 'desktop', onClick, + profilePic, }: MeetingExtraInfoProps) => { // 스타일 조건 분기 const isTablet = variant === 'tablet'; @@ -30,8 +32,8 @@ const MeetingExtraInfo = ({
모임장 @@ -39,7 +41,13 @@ const MeetingExtraInfo = ({
- + profile_img {name}
@@ -47,8 +55,8 @@ const MeetingExtraInfo = ({
모임시작 @@ -62,7 +70,7 @@ const MeetingExtraInfo = ({
+
+ +
+ {likesCount} +
+
)}
diff --git a/src/util/searchFilter.ts b/src/util/searchFilter.ts index 559f6c9..eae2f4f 100644 --- a/src/util/searchFilter.ts +++ b/src/util/searchFilter.ts @@ -44,3 +44,18 @@ export const translateCategoryNameToEng = (category: string) => { return 'mogakco'; } }; + +export const imageUrlByCategory = (category: string) => { + switch (category) { + case 'mogakco': + return '/mogakco_cat.png'; + case 'hobby': + return '/hobby_cat.png'; + case 'study': + return '/read_cat.png'; + case 'side-project': + return '/side-project_cat.png'; + default: + return '/mogakco_cat.png'; + } +}; diff --git a/tailwind.config.ts b/tailwind.config.ts index 173b224..cf2e32d 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -104,6 +104,10 @@ export default { sans: ['var(--font-pretendard)', 'sans-serif'], }, keyframes: { + fadeIn: { + '0%': { opacity: '0' }, + '100%': { opacity: '1' }, + }, fadeInUp: { '0%': { opacity: '0', transform: 'translateY(40px)' }, '100%': { opacity: '1', transform: 'translateY(0)' }, @@ -126,6 +130,7 @@ export default { }, }, animation: { + fadeIn: 'fadeIn 0.5s ease-out forwards', fadeInUp: 'fadeInUp 0.5s ease-out forwards', slideUp: 'slideUp 0.5s ease-out forwards', slideDown: 'slideDown 0.5s ease-out forwards',