Skip to content

Feat/refactor/like optimistic update/DEVING-67 #57

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 8 commits into from
Mar 11, 2025
Merged

Feat/refactor/like optimistic update/DEVING-67 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bcf2621
feat(DEVING): ์ข‹์•„์š” optimistic update ์ ์šฉ
lee1nna Mar 6, 2025
11d4584
fix(DEVING-67): ๋‹‰๋„ค์ž„ ๊ธธ์–ด์งˆ ๊ฒฝ์šฐ ๊ณ ์–‘์ด ์ด๋ฏธ์ง€ ๊นจ์ง€๋Š” ํ˜„์ƒ ์ˆ˜์ •
lee1nna Mar 6, 2025
08e9baf
refactor(DEVING-67): ์นด๋“œ ๊ทธ๋ฆฌ๋“œ ํ˜•์‹์œผ๋กœ ์ˆ˜์ •
lee1nna Mar 6, 2025
a67a738
Merge branch 'dev' into feat/refactor/like-optimistic-update/DEVING-67
lee1nna Mar 6, 2025
c6ef6bf
fix(DEVING-67): ํ—ค๋” ๋“œ๋กญ๋‹ค์šด ๋ฉ”๋‰ด ํด๋ฆญ ์‹œ ์šฐ์ธก ์—ฌ๋ฐฑ ์ƒ๊ธฐ๋Š” ํ˜„์ƒ ์ˆ˜์ •
lee1nna Mar 7, 2025
39868dc
fix(DEVING-67): ๋‚˜์˜ ๋ชจ์ž„ ์ฃผ์„์ฒ˜๋ฆฌ ์ œ๊ฑฐ
lee1nna Mar 7, 2025
86d50eb
Merge branch 'dev' into feat/refactor/like-optimistic-update/DEVING-67
lee1nna Mar 10, 2025
3d85dfa
fix(DEVING-67): ๋ชจ์ž„๋ชฉ๋ก API ํ™˜๊ฒฝ๋ณ€์ˆ˜ ์ œ๊ฑฐ
lee1nna Mar 10, 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
2 changes: 1 addition & 1 deletion src/app/meeting/_features/CardWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const CardWrapper = ({ meetingId }: { meetingId: number }) => {
<VerticalCard
meetingId={meetingId}
category={translateCategoryNameToKor(categoryStr)}
className="h-fit w-full"
className="h-[650px] w-full"
thumbnailHeight={252}
thumbnailWidth={343}
key={meeting.meetingId}
Expand Down
4 changes: 2 additions & 2 deletions src/app/meeting/_features/MeetingExtraInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ const MeetingExtraInfo = ({
<div
className={`${isMobile ? 'typo-button2' : 'typo-head2'} mt-1 flex items-center text-Cgray700`}
>
<Profile className="mr-2 h-10 w-10" />
<span className="text-ellipsi truncate">{name}</span>
<Profile className="mr-2 h-10 w-10 flex-shrink-0" />
<span className="truncate text-ellipsis">{name}</span>
</div>
</div>
<div className="flex flex-col">
Expand Down
206 changes: 97 additions & 109 deletions src/app/meeting/_features/MeetingList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ const MeetingList = () => {
},
);

const allMeetings: SearchMeeting[] =
data?.pages.flatMap((page) => page.content) || [];

Comment on lines +49 to +51
Copy link
Contributor

@dbswl701 dbswl701 Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flatMap ์ข‹์Šต๋‹ˆ๋‹ค! ํ•˜๋‚˜ ๋ฐฐ์›Œ๊ฐ‘๋‹ˆ๋‹ค!

const lastMeetingRef = useInfiniteScroll({
fetchNextPage,
isFetchingNextPage,
Expand Down Expand Up @@ -140,128 +143,113 @@ const MeetingList = () => {
{/* ๋ชจ์ž„ ๋ฆฌ์ŠคํŠธ ์›น๋ทฐ */}
{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}
category={translateCategoryNameToKor(categoryStr)}
title={meeting.meetingTitle}
thumbnailUrl={meeting.thumbnail}
location={meeting.location}
isLike={meeting.isLike}
total={meeting.maxMember}
value={meeting.memberCount}
searchQuery={searchQuery}
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>
{allMeetings.map((meeting) => (
<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}
searchQuery={searchQuery}
likesCount={meeting.likesCount}
skills={meeting.meetingSkillArray}
>
<MeetingExtraInfo
lastMeetingRef={
meeting.meetingId ===
allMeetings[allMeetings.length - 1].meetingId
? lastMeetingRef
: null
}
name={meeting.name}
startDate={meeting.startDate}
meetingId={meeting.meetingId}
variant="desktop"
/>
</HorizonCard>
))}
</div>
)}

{/* ๋ชจ์ž„ ๋ฆฌ์ŠคํŠธ ํ…Œ๋ธ”๋ฆฟ๋ทฐ */}
{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}
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}
searchQuery={searchQuery}
skills={meeting.meetingSkillArray}
>
<MeetingExtraInfo
lastMeetingRef={
page.nextCursor === meeting.meetingId
? lastMeetingRef
: null
}
name={meeting.name}
startDate={meeting.startDate}
meetingId={meeting.meetingId}
variant="tablet"
/>
</HorizonCard>
);
})}
</div>
{allMeetings.map((meeting) => (
<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}
searchQuery={searchQuery}
skills={meeting.meetingSkillArray}
>
<MeetingExtraInfo
lastMeetingRef={
meeting.meetingId ===
allMeetings[allMeetings.length - 1].meetingId
? lastMeetingRef
: null
}
name={meeting.name}
startDate={meeting.startDate}
meetingId={meeting.meetingId}
variant="tablet"
/>
</HorizonCard>
))}
</div>
)}

{/* ๋ชจ์ž„ ๋ฆฌ์ŠคํŠธ ๋ชจ๋ฐ”์ผ๋ทฐ */}
{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}
title={meeting.meetingTitle}
thumbnailUrl={meeting.thumbnail}
location={meeting.location}
isLike={meeting.isLike}
likesCount={meeting.likesCount}
total={meeting.maxMember}
value={meeting.memberCount}
searchQuery={searchQuery}
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 className="flex w-full flex-wrap items-center justify-center md:hidden lg:hidden">
{allMeetings.map((meeting) => (
<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}
searchQuery={searchQuery}
skills={meeting.meetingSkillArray}
>
<MeetingExtraInfo
lastMeetingRef={
meeting.meetingId ===
allMeetings[allMeetings.length - 1].meetingId
? lastMeetingRef
: null
}
name={meeting.name}
startDate={meeting.startDate}
meetingId={meeting.meetingId}
variant="mobile"
/>
</VerticalCard>
))}
</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const Dropdown = ({
!className?.includes('w-[460px]');

return (
<DropdownMenuPrimitive.Root onOpenChange={setIsOpen}>
<DropdownMenuPrimitive.Root onOpenChange={setIsOpen} modal={false}>
Copy link
Contributor

@dbswl701 dbswl701 Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modal ํ”„๋กœํผํ‹ฐ๋ฅผ ์„ค์ •ํ•˜์‹  ์ด์œ ๊ฐ€ ๊ถ๊ธˆํ•ฉ๋‹ˆ๋‹ค!

Copy link
Contributor Author

@lee1nna lee1nna Mar 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๋“œ๋กญ๋‹ค์šด์ด modal true๊ฐ€ default์ธ๋ฐ ์ด ์„ค์ •๋•Œ๋ฌธ์— gnb์—์„œ ํ”„๋กœํ•„ ํด๋ฆญ์‹œ ์šฐ์ธก์— ์Šคํฌ๋กค ์—ฌ๋ฐฑ์ด ๋‚˜์™”์—ˆ๋Š”๋ฐ,
modal ์„ค์ •์„ false๋กœ ํ•ด์ค˜์•ผ์ง€ ํ•ด๋‹น ์ด์Šˆ๊ฐ€ ์•ˆ์ƒ๊ฒจ์„œ ์ถ”๊ฐ€ํ•ด๋‘์—ˆ์Šต๋‹ˆ๋‹น

<DropdownMenuPrimitive.Trigger
ref={triggerRef}
className={cn(
Expand Down
Loading
Loading