From 87e8c5297132ccaa34f3f5a12ea0d30f0753ee16 Mon Sep 17 00:00:00 2001 From: "hs_okita.kunio" Date: Sat, 25 Mar 2023 20:41:04 +0900 Subject: [PATCH] =?UTF-8?q?=E6=9C=9F=E9=99=90=E5=88=87=E3=82=8C=E3=81=AE?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AB=E8=83=8C=E6=99=AF=E3=82=92=E8=B5=A4?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=EF=BC=88=E3=83=9C=E3=83=BC=E3=83=89?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=AE=E3=82=AB=E3=83=BC=E3=83=89=E3=81=AE?= =?UTF-8?q?=E3=81=BF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/components/Card/Card.jsx | 4 +++- client/src/components/DueDate/DueDate.jsx | 8 ++++++-- client/src/components/DueDate/DueDate.module.scss | 13 +++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/client/src/components/Card/Card.jsx b/client/src/components/Card/Card.jsx index 37521a06..10dfd49b 100755 --- a/client/src/components/Card/Card.jsx +++ b/client/src/components/Card/Card.jsx @@ -86,6 +86,8 @@ const Card = React.memo( const ActionsPopup = usePopup(ActionsStep); + const isExpiredDueDate = dueDate && dueDate.getTime() < new Date().getTime(); + const contentNode = ( <> {coverUrl && } @@ -119,7 +121,7 @@ const Card = React.memo( )} {dueDate && ( - + )} {stopwatch && ( diff --git a/client/src/components/DueDate/DueDate.jsx b/client/src/components/DueDate/DueDate.jsx index e36fa251..207d30bf 100644 --- a/client/src/components/DueDate/DueDate.jsx +++ b/client/src/components/DueDate/DueDate.jsx @@ -18,13 +18,15 @@ const FORMATS = { medium: 'longDateTime', }; -const DueDate = React.memo(({ value, size, isDisabled, onClick }) => { +const DueDate = React.memo(({ value, size, isDisabled, onClick, isExpired }) => { const [t] = useTranslation(); + const wrapperClass = isExpired ? styles.wrapperExpired : styles.wrapper; + const contentNode = (