diff --git a/jobdri/src/app/page.tsx b/jobdri/src/app/page.tsx index 4ac8d17..27ccc28 100644 --- a/jobdri/src/app/page.tsx +++ b/jobdri/src/app/page.tsx @@ -55,7 +55,7 @@ export default function Home() { ); // ๐ ์์ฑ ์ค์ธ ๋ชจ์์ง์(Drafts) ๋งคํ - const mappedDrafts = inProgressList.map((item) => { + const mappedDrafts: DraftData[] = inProgressList.map((item) => { const jobPosting = jobPostingById.get(item.jobPostingId); return { @@ -75,6 +75,9 @@ export default function Home() { updatedAt: item.createdAt ? formatRelativeDate(item.createdAt) : "-", + createdAtTime: item.createdAt + ? new Date(item.createdAt).getTime() + : 0, }; }); @@ -85,7 +88,7 @@ export default function Home() { ); // ๐ ์์ ์ฑ์ฉ ๊ณต๊ณ (Drafts) ๋งคํ - const savedOnlyDrafts = jobPostings + const savedOnlyDrafts: DraftData[] = jobPostings .filter( (jobPosting) => !linkedJobPostingIds.has(jobPosting.jobPostingId), ) @@ -102,6 +105,9 @@ export default function Home() { updatedAt: jobPosting.createdAt ? formatRelativeDate(jobPosting.createdAt) : "-", + createdAtTime: jobPosting.createdAt + ? new Date(jobPosting.createdAt).getTime() + : 0, })); const mappedResults = completedList.map((item) => { @@ -123,7 +129,23 @@ export default function Home() { return cardData; }); - setDrafts([...savedOnlyDrafts, ...mappedDrafts]); + const sortedDrafts = [...savedOnlyDrafts, ...mappedDrafts].sort( + (a, b) => { + const timeDifference = + (b.createdAtTime ?? 0) - (a.createdAtTime ?? 0); + + if (timeDifference !== 0) { + return timeDifference; + } + + return ( + (b.mockApplyId ?? b.jobPostingId) - + (a.mockApplyId ?? a.jobPostingId) + ); + }, + ); + + setDrafts(sortedDrafts); setResults(mappedResults); } catch (error) { console.error("๋ฐ์ดํฐ๋ฅผ ๋ถ๋ฌ์ค๋๋ฐ ์คํจํ์ต๋๋ค.", error); diff --git a/jobdri/src/components/common/dropdown/DropDownMenu.tsx b/jobdri/src/components/common/dropdown/DropDownMenu.tsx index c719121..2ea0a61 100644 --- a/jobdri/src/components/common/dropdown/DropDownMenu.tsx +++ b/jobdri/src/components/common/dropdown/DropDownMenu.tsx @@ -34,7 +34,7 @@ export default function DropDownMenu({ role="menuitem" disabled={item.disabled} onClick={item.onClick} - className="flex w-full items-center self-stretch border-b border-line-neutral-default bg-bg-contents-default px-4 py-3 text-left text-label14-med text-text-neutral-description [font-feature-settings:'liga'_off,'clig'_off] hover:bg-fill-quaternary-assistive-hover active:bg-fill-quaternary-default-pressed disabled:cursor-not-allowed disabled:text-text-neutral-disabled" + className="flex w-full items-center self-stretch border-b border-line-neutral-default bg-bg-contents-default px-4 py-3 text-left text-label14-med text-text-neutral-description [font-feature-settings:'liga'_off,'clig'_off] last:border-b-0 hover:bg-fill-quaternary-assistive-hover active:bg-fill-quaternary-default-pressed disabled:cursor-not-allowed disabled:text-text-neutral-disabled" > {item.label} diff --git a/jobdri/src/components/common/lnb/Lnb.tsx b/jobdri/src/components/common/lnb/Lnb.tsx index 6d13134..5bc6f39 100644 --- a/jobdri/src/components/common/lnb/Lnb.tsx +++ b/jobdri/src/components/common/lnb/Lnb.tsx @@ -75,7 +75,7 @@ export default function Lnb({ initialActiveItem = "apply", email, className, - defaultRecentOpen = true, + defaultRecentOpen = false, disableCreditFetch = false, }: LnbProps) { const router = useRouter(); @@ -401,15 +401,11 @@ export default function Lnb({ {showComingSoonModal && createPortal( -
- ๊ฒ์ ๊ฒฐ๊ณผ๊ฐ ์์ต๋๋ค -
-+ ๊ฒ์ ๊ฒฐ๊ณผ๊ฐ ์์ต๋๋ค +
{createdAt}
{score}
-์
+{score}
+์
+