Skip to content

Feat/issue/meeting list infinite scroll/Deving-55 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lee1nna merged 2 commits into from
Mar 2, 2025
Merged

Feat/issue/meeting list infinite scroll/Deving-55 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82283ed
feat(DEVING-55): ๋ชจ์ž„ ๋ฆฌ์ŠคํŠธ ๋ฌดํ•œ์Šคํฌ๋กค ์ด์Šˆ ์ˆ˜์ •
lee1nna Mar 2, 2025
cc8dbab
feat(DEVING-55): mypage ๋งํฌ url ์ˆ˜์ •
lee1nna Mar 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
229 changes: 117 additions & 112 deletions src/app/meeting/components/MeetingList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,125 +139,130 @@ const MeetingList = () => {
{data?.pages[0].content.length === 0 && <NoResultsMeeting />}

{/* ๋ชจ์ž„ ๋ฆฌ์ŠคํŠธ ์›น๋ทฐ */}

<div className="hidden flex-col md:hidden lg:flex">
{data?.pages.map((page, pageIndex) => (
<div key={pageIndex}>
{page.content.map((meeting: SearchMeeting) => {
return (
<HorizonCard
onClick={handleMoveDetailPage}
key={meeting.meetingId}
meetingId={meeting.meetingId}
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}
>
<MeetingExtraInfo
lastMeetingRef={
page.nextCursor === meeting.meetingId
? lastMeetingRef
: null
}
name={meeting.name}
startDate={meeting.startDate}
{breakpoint === 'desktop' && (
<div className="flex-col sm:hidden lg:flex">
{data?.pages.map((page, pageIndex) => (
<div key={pageIndex}>
{page.content.map((meeting: SearchMeeting) => {
return (
<HorizonCard
onClick={handleMoveDetailPage}
key={meeting.meetingId}
meetingId={meeting.meetingId}
variant="desktop"
/>
</HorizonCard>
);
})}
</div>
))}
</div>
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}
>
<MeetingExtraInfo
lastMeetingRef={
page.nextCursor === meeting.meetingId
? lastMeetingRef
: null
}
name={meeting.name}
startDate={meeting.startDate}
meetingId={meeting.meetingId}
variant="desktop"
/>
</HorizonCard>
);
})}
</div>
))}
</div>
)}

{/* ๋ชจ์ž„ ๋ฆฌ์ŠคํŠธ ํ…Œ๋ธ”๋ฆฟ๋ทฐ */}
<div className="hidden flex-col md:flex lg:hidden">
{data?.pages.map((page, pageIndex) => (
<div key={pageIndex}>
{page.content.map((meeting: SearchMeeting) => {
return (
<HorizonCard
onClick={handleMoveDetailPage}
className="items-center"
key={meeting.meetingId}
meetingId={meeting.meetingId}
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}
>
<MeetingExtraInfo
lastMeetingRef={
page.nextCursor === meeting.meetingId
? lastMeetingRef
: null
}
name={meeting.name}
startDate={meeting.startDate}
{breakpoint === 'tablet' && (
<div className="hidden flex-col md:flex lg:hidden">
{data?.pages.map((page, pageIndex) => (
<div key={pageIndex}>
{page.content.map((meeting: SearchMeeting) => {
return (
<HorizonCard
onClick={handleMoveDetailPage}
className="items-center"
key={meeting.meetingId}
meetingId={meeting.meetingId}
variant="tablet"
/>
</HorizonCard>
);
})}
</div>
))}
</div>
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}
>
<MeetingExtraInfo
lastMeetingRef={
page.nextCursor === meeting.meetingId
? lastMeetingRef
: null
}
name={meeting.name}
startDate={meeting.startDate}
meetingId={meeting.meetingId}
variant="tablet"
/>
</HorizonCard>
);
})}
</div>
))}
</div>
)}

{/* ๋ชจ์ž„ ๋ฆฌ์ŠคํŠธ ๋ชจ๋ฐ”์ผ๋ทฐ */}
<div className="flex flex-col items-center md:hidden lg:hidden">
{data?.pages.map((page, pageIndex) => (
<div key={pageIndex}>
{page.content.map((meeting: SearchMeeting) => {
return (
<VerticalCard
onClick={handleMoveDetailPage}
className="h-[380px]"
thumbnailHeight={160}
thumbnailWidth={311}
category={translateCategoryNameToKor(categoryStr)}
key={meeting.meetingId}
meetingId={meeting.meetingId}
title={meeting.meetingTitle}
thumbnailUrl={meeting.thumbnail}
location={meeting.location}
isLike={meeting.isLike}
likesCount={meeting.likesCount}
total={meeting.maxMember}
value={meeting.memberCount}
skills={meeting.meetingSkillArray}
>
<MeetingExtraInfo
lastMeetingRef={
page.nextCursor === meeting.meetingId
? lastMeetingRef
: null
}
name={meeting.name}
startDate={meeting.startDate}
{breakpoint === 'mobile' && (
<div className="flex flex-col items-center md:hidden lg:hidden">
{data?.pages.map((page, pageIndex) => (
<div key={pageIndex}>
{page.content.map((meeting: SearchMeeting) => {
return (
<VerticalCard
onClick={handleMoveDetailPage}
className="h-[380px]"
thumbnailHeight={160}
thumbnailWidth={311}
category={translateCategoryNameToKor(categoryStr)}
key={meeting.meetingId}
meetingId={meeting.meetingId}
variant="mobile"
/>
</VerticalCard>
);
})}
</div>
))}
</div>
title={meeting.meetingTitle}
thumbnailUrl={meeting.thumbnail}
location={meeting.location}
isLike={meeting.isLike}
likesCount={meeting.likesCount}
total={meeting.maxMember}
value={meeting.memberCount}
skills={meeting.meetingSkillArray}
>
<MeetingExtraInfo
lastMeetingRef={
page.nextCursor === meeting.meetingId
? lastMeetingRef
: null
}
name={meeting.name}
startDate={meeting.startDate}
meetingId={meeting.meetingId}
variant="mobile"
/>
</VerticalCard>
);
})}
</div>
))}
</div>
)}
</div>
);
};
Expand Down
10 changes: 7 additions & 3 deletions src/components/common/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -52,7 +53,7 @@ const AfterLogin = ({ userInfo }: { userInfo: IUserInfo }) => {
{
value: 'mypage',
label: '๋งˆ์ดํŽ˜์ด์ง€',
onSelect: () => router.push('/my-page'),
onSelect: () => router.push('/mypage'),
},
{
value: 'logout',
Expand Down Expand Up @@ -135,7 +136,7 @@ const MobileAfterLogin = ({ userInfo }: { userInfo: IUserInfo }) => {
</div>
<Link
className="typo-head4 p-[16px] text-Cgray400 hover:text-Cgray500"
href="/my-page"
href="/mypage"
>
๋งˆ์ดํŽ˜์ด์ง€
</Link>
Expand All @@ -158,7 +159,10 @@ const NavLinks = ({ isMobile }: { isMobile?: boolean }) => {
className={`${!isMobile ? 'hidden items-center text-Cgray700 lg:flex' : 'text-Cgray400'}`}
>
{navigation.map((item) => (
<li className="typo-head4 p-[16px]" key={item.label}>
<li
className={`typo-head4 p-[16px] ${category && translateCategoryNameToKor(categoryStr) === item.label && 'text-white'}`}
key={item.label}
>
<Link
href={item.href}
className={`${isMobile ? 'hover:text-Cgray500' : 'hover:text-white'}`}
Expand Down
6 changes: 3 additions & 3 deletions src/hooks/common/useMediaQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ const useMediaQuery = () => {
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');
}
};
Expand Down
Loading