From a9a2b65e1a5bc0d595cb780e74ac82ca733fe1d3 Mon Sep 17 00:00:00 2001 From: Jin Date: Fri, 3 Nov 2023 02:11:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[mobile]=20=EC=8B=9D=EB=8B=B9=20time=20?= =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=ED=8F=B0=ED=8A=B8=20=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95=20(#993)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/molecules/CafeteriaMenuCard/style.module.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mobile/src/components/molecules/CafeteriaMenuCard/style.module.scss b/packages/mobile/src/components/molecules/CafeteriaMenuCard/style.module.scss index 05c9b705..e730a666 100644 --- a/packages/mobile/src/components/molecules/CafeteriaMenuCard/style.module.scss +++ b/packages/mobile/src/components/molecules/CafeteriaMenuCard/style.module.scss @@ -10,8 +10,9 @@ .meal-time { margin-top: 3px; font-weight: 500; - @include typography(14); + @include typography(16); line-height: 25px; + letter-spacing: 1.5; color: $black-100; } &-info { From 58499b60e8fba1a980dc57520330f776b8f416d8 Mon Sep 17 00:00:00 2001 From: jess Date: Sat, 2 Dec 2023 04:14:12 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20=EC=9E=98=EB=AA=BB=EB=90=9C?= =?UTF-8?q?=20=EB=B6=81=EB=A7=88=ED=81=AC=20=EC=8A=A4=EC=BC=80=EC=A4=84=20?= =?UTF-8?q?=ED=95=84=ED=84=B0=EB=A7=81=20=EC=A1=B0=EA=B1=B4=EB=AC=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/src/page/Home/ScheduleContainer/index.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/mobile/src/page/Home/ScheduleContainer/index.tsx b/packages/mobile/src/page/Home/ScheduleContainer/index.tsx index bb15c42a..a7233e5d 100644 --- a/packages/mobile/src/page/Home/ScheduleContainer/index.tsx +++ b/packages/mobile/src/page/Home/ScheduleContainer/index.tsx @@ -15,10 +15,11 @@ export default function ScheduleContainer({ today }: Props) { data?.filter((schedule) => { const today = dayjs(); - if (today.isSame(schedule.startDateTime, "date")) return true; - if (today.isBefore(schedule.startDateTime, "date")) return false; - if (schedule.endDateTime && today.isAfter(schedule.endDateTime, "date")) - return false; + const { startDateTime, endDateTime } = schedule; + + if (endDateTime && today.isAfter(endDateTime, "date")) return false; + if (today.isBefore(startDateTime, "date")) return false; + if (!endDateTime && today.isAfter(startDateTime, "date")) return false; return true; }) ?? [];