From 39eeba3efbc04d9785217a0822dbc5715949f6c5 Mon Sep 17 00:00:00 2001 From: kyr4601 Date: Mon, 6 Jan 2025 18:37:59 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Fix:=20ios=20=EC=95=84=EC=9D=B4=EC=BD=98=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client/src/assets/icons/GridIcon.tsx | 4 ++-- apps/client/src/assets/icons/PrevIcon.tsx | 6 +++--- apps/client/src/components/cake/CakeHeader.tsx | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/client/src/assets/icons/GridIcon.tsx b/apps/client/src/assets/icons/GridIcon.tsx index ab621d7..cdf8e1e 100644 --- a/apps/client/src/assets/icons/GridIcon.tsx +++ b/apps/client/src/assets/icons/GridIcon.tsx @@ -7,8 +7,8 @@ const GridIcon = (props: SVGProps) => { xmlns="http://www.w3.org/2000/svg" > diff --git a/apps/client/src/assets/icons/PrevIcon.tsx b/apps/client/src/assets/icons/PrevIcon.tsx index c6c9e76..9139974 100644 --- a/apps/client/src/assets/icons/PrevIcon.tsx +++ b/apps/client/src/assets/icons/PrevIcon.tsx @@ -5,13 +5,13 @@ const PrevIcon = (props: SVGProps) => { ); diff --git a/apps/client/src/components/cake/CakeHeader.tsx b/apps/client/src/components/cake/CakeHeader.tsx index e24ba89..1be6f07 100644 --- a/apps/client/src/components/cake/CakeHeader.tsx +++ b/apps/client/src/components/cake/CakeHeader.tsx @@ -29,12 +29,12 @@ const SubTitle = styled.h2` margin-top: 0.5rem; `; -const Nickname = styled.h1` +const Nickname = styled.p` color: var(--orange-500); display: inline; `; -const Phrase = styled.h1` +const Phrase = styled.p` display: inline; `; @@ -78,7 +78,7 @@ const CakeHeader = ({ navigate('/mypage'); }} > - {!isPC && ()} + {!isPC && ()} )} From 7e1974480d60d60d255af80c134edbdd924607ed Mon Sep 17 00:00:00 2001 From: kyr4601 Date: Mon, 6 Jan 2025 20:59:33 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Fix:=20=ED=8E=B8=EC=A7=80=EC=9E=91=EC=84=B1?= =?UTF-8?q?=20=EA=B8=B0=EC=A4=80=2030=EC=9D=BC=EC=97=90=EC=84=9C=207?= =?UTF-8?q?=EC=9D=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client/src/ModalPortal.ts | 6 +++--- apps/server/src/routes/cake.ts | 6 +++--- apps/server/src/service/letter.ts | 15 ++++++--------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/apps/client/src/ModalPortal.ts b/apps/client/src/ModalPortal.ts index afd79b6..6c87cd0 100644 --- a/apps/client/src/ModalPortal.ts +++ b/apps/client/src/ModalPortal.ts @@ -6,9 +6,9 @@ interface ModalPortalProps { } export const ModalPortal: React.FC = ({ children }) => { - const el = document.getElementById('modal'); - if (!el) { + const modalElement = document.getElementById('modal'); + if (!modalElement) { return null; } - return ReactDOM.createPortal(children, el); + return ReactDOM.createPortal(children, modalElement); }; diff --git a/apps/server/src/routes/cake.ts b/apps/server/src/routes/cake.ts index 04af0b6..ea04b0d 100644 --- a/apps/server/src/routes/cake.ts +++ b/apps/server/src/routes/cake.ts @@ -85,14 +85,14 @@ router.get('/cake/:ownerId', async (req, res) => { const today = new Date(); const birthday = cakeUserData.birthday; - const thisYearBdayAfter30 = new Date( + const thisYearBdayAfter7 = new Date( today.getFullYear(), birthday.getMonth(), - birthday.getDate() + 30, + birthday.getDate() + 7, ); const year = - today > thisYearBdayAfter30 + today > thisYearBdayAfter7 ? today.getFullYear() + 1 : today.getFullYear(); diff --git a/apps/server/src/service/letter.ts b/apps/server/src/service/letter.ts index a92be20..9884742 100644 --- a/apps/server/src/service/letter.ts +++ b/apps/server/src/service/letter.ts @@ -1,16 +1,13 @@ export function getLetterYearBasedOnBirthday(birthday: Date): number { const today = new Date(); - const thisYearBirthday = new Date( + + const thisYearBdayAfter7 = new Date( today.getFullYear(), birthday.getMonth(), - birthday.getDate(), + birthday.getDate() + 7, ); - // 생일 기준으로 30일 이후인지 확인 - const timeDifference = thisYearBirthday.getTime() - today.getTime(); - const daysUntilBirthday = timeDifference / (1000 * 60 * 60 * 24); - - return daysUntilBirthday <= 30 && daysUntilBirthday >= 0 - ? today.getFullYear() - : today.getFullYear() + 1; + return today > thisYearBdayAfter7 + ? today.getFullYear() + 1 + : today.getFullYear(); } From 927c4845f6bc0cabb7f2cd66c3a98c89ad4d7cb5 Mon Sep 17 00:00:00 2001 From: kyr4601 Date: Sun, 19 Jan 2025 15:12:51 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Fix:=20react=20query=20staletime=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/client/src/apis/cake/useGetCakeLetters.tsx | 1 + apps/client/src/apis/cake/useGetYear.tsx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/client/src/apis/cake/useGetCakeLetters.tsx b/apps/client/src/apis/cake/useGetCakeLetters.tsx index 1462668..3af0ad3 100644 --- a/apps/client/src/apis/cake/useGetCakeLetters.tsx +++ b/apps/client/src/apis/cake/useGetCakeLetters.tsx @@ -13,5 +13,6 @@ export const useGetCakeLetters = (ownerId: string, year: string, page: number) = return useSuspenseQuery({ queryKey: ['cake-letters', ownerId, year, page], queryFn: () => fetchCakeLetters(ownerId, year, page), + staleTime: 1000 * 60, }); } diff --git a/apps/client/src/apis/cake/useGetYear.tsx b/apps/client/src/apis/cake/useGetYear.tsx index 9d184a4..a8572e8 100644 --- a/apps/client/src/apis/cake/useGetYear.tsx +++ b/apps/client/src/apis/cake/useGetYear.tsx @@ -10,6 +10,7 @@ async function fetchYear() { export const useGetYear = () => { return useSuspenseQuery({ queryKey: ['get-year'], - queryFn: () => fetchYear() + queryFn: () => fetchYear(), + staleTime: 1000 * 60 * 5, }) }