From 812237f7a8ad982cdf75ed92b0b4458c91d92a09 Mon Sep 17 00:00:00 2001 From: Tapas Adhikary Date: Mon, 31 Jan 2022 14:25:53 +0530 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20Corrected=20expiry=20logic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plays/date-time-counter/CdTimerComp.js | 11 +++++++++-- src/plays/date-time-counter/CountDownTimer.js | 2 +- src/plays/movies/movies.css | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/plays/date-time-counter/CdTimerComp.js b/src/plays/date-time-counter/CdTimerComp.js index aa0e3b6813..d00b0908dd 100644 --- a/src/plays/date-time-counter/CdTimerComp.js +++ b/src/plays/date-time-counter/CdTimerComp.js @@ -2,14 +2,21 @@ import { useState } from "react"; import CountDownTimer from "./CountDownTimer"; const CdTimerComp = () => { - const dateTimeAfterThreeDays = new Date().getTime() + 3 * 24 * 60 * 60 * 1000; + const THREE_DAYS_IN_MS = 3 * 24 * 60 * 60 * 1000; + const NOW_IN_MS = new Date().getTime(); + + const dateTimeAfterThreeDays = NOW_IN_MS + THREE_DAYS_IN_MS; const [targetDate, setTargetDate] = useState( new Date(dateTimeAfterThreeDays) ); const handleChange = (event) => { event.preventDefault(); - setTargetDate(new Date(event.target.value)); + if (event.target.value) { + setTargetDate(new Date(event.target.value)); + } else { + setTargetDate(new Date(dateTimeAfterThreeDays)); + } }; return ( diff --git a/src/plays/date-time-counter/CountDownTimer.js b/src/plays/date-time-counter/CountDownTimer.js index 4153d82787..c25f3b0143 100644 --- a/src/plays/date-time-counter/CountDownTimer.js +++ b/src/plays/date-time-counter/CountDownTimer.js @@ -35,7 +35,7 @@ const ShowCounter = ({ days, hours, minutes, seconds }) => { const CountDownTimer = ({ targetDate }) => { const [days, hours, minutes, seconds] = useCountDown(targetDate); - if (days < 0) { + if (seconds <= 0) { return ; } else { return ( diff --git a/src/plays/movies/movies.css b/src/plays/movies/movies.css index a0494786df..3cc0461e85 100644 --- a/src/plays/movies/movies.css +++ b/src/plays/movies/movies.css @@ -24,6 +24,10 @@ li { border: 1px solid #ccc; border-radius: 5px; background-color: #fff; + justify-content: center; + align-items: center; + display: flex; + flex-direction: column; } .movie img { From 1b3dda80022febb5f1befe11485b174b48aa9591 Mon Sep 17 00:00:00 2001 From: Tapas Adhikary Date: Mon, 31 Jan 2022 16:42:55 +0530 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20fixed=20a=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plays/date-time-counter/CountDownTimer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plays/date-time-counter/CountDownTimer.js b/src/plays/date-time-counter/CountDownTimer.js index c25f3b0143..f3eb96a056 100644 --- a/src/plays/date-time-counter/CountDownTimer.js +++ b/src/plays/date-time-counter/CountDownTimer.js @@ -35,7 +35,7 @@ const ShowCounter = ({ days, hours, minutes, seconds }) => { const CountDownTimer = ({ targetDate }) => { const [days, hours, minutes, seconds] = useCountDown(targetDate); - if (seconds <= 0) { + if (days + hours + minutes + seconds <= 0) { return ; } else { return (