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/CardModal/CardModal.jsx b/client/src/components/CardModal/CardModal.jsx index d72ccca2..93504f90 100755 --- a/client/src/components/CardModal/CardModal.jsx +++ b/client/src/components/CardModal/CardModal.jsx @@ -167,6 +167,8 @@ const CardModal = React.memo( const userIds = users.map((user) => user.id); const labelIds = labels.map((label) => label.id); + const isExpiredDueDate = dueDate && dueDate.getTime() < new Date().getTime(); + const contentNode = ( @@ -286,10 +288,10 @@ const CardModal = React.memo( {canEdit ? ( - + ) : ( - + )} 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 = (