From 95708f99ba872710a2acc891498f3d3ad306cbec Mon Sep 17 00:00:00 2001 From: Bahugunajii Date: Fri, 22 Mar 2024 12:14:28 +0530 Subject: [PATCH 1/2] show 12 hr format --- app/page.tsx | 10 +++++----- utils/dateUtils.ts | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/page.tsx b/app/page.tsx index b3387fd..4ff7b71 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -19,7 +19,7 @@ export default function Home() { const [liveClasses, setLiveClasses] = useState([]); const [isLoading, setIsLoading] = useState(true); const [quizzes, setQuizzes] = useState([]); - const commonTextClass = "text-gray-700 text-sm md:text-base mx-6 md:mx-8"; + const commonTextClass = "text-gray-700 text-xs md:text-sm mx-3 md:mx-8 whitespace-nowrap w-12"; const infoMessageClass = "flex items-center justify-center text-center h-72 mx-4 pb-40"; const portalBaseUrl = api.portal.frontend.baseUrl; const [batchId, setBatchId] = useState(); @@ -105,7 +105,7 @@ export default function Home() { return (

Starts at
- {sessionStartTimeStr} + {formatTime(sessionStartTimeStr)}

); } @@ -122,7 +122,7 @@ export default function Home() { return (

Starts at
- {sessionStartTimeStr} + {formatTime(sessionStartTimeStr)}

); } @@ -204,10 +204,10 @@ export default function Home() {

- {formatQuizSessionTime(data.start_time)} + {formatTime(formatQuizSessionTime(data.start_time))}

- {formatQuizSessionTime(data.end_time)} + {formatTime(formatQuizSessionTime(data.end_time))}

diff --git a/utils/dateUtils.ts b/utils/dateUtils.ts index bf5fc33..809f1c2 100644 --- a/utils/dateUtils.ts +++ b/utils/dateUtils.ts @@ -43,8 +43,8 @@ export function formatQuizSessionTime(dateTimeStr: string) { } export function formatTime(dateTimeStr: string) { - const [hours, minutes] = dateTimeStr.split(':'); - return `${hours}:${minutes}`; + const time = new Date(`2000-01-01T${dateTimeStr}`); + return time.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit', hour12: true }); } export function isSessionActive(endTime: string): boolean { From e3d075e9734f2f3a80dc56c6413d03d4f3b4e89f Mon Sep 17 00:00:00 2001 From: Bahugunajii Date: Fri, 22 Mar 2024 13:35:21 +0530 Subject: [PATCH 2/2] code optimization --- app/page.tsx | 4 ++-- utils/dateUtils.ts | 12 ++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/page.tsx b/app/page.tsx index 4ff7b71..70b2016 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -204,10 +204,10 @@ export default function Home() {

- {formatTime(formatQuizSessionTime(data.start_time))} + {formatQuizSessionTime(data.start_time)}

- {formatTime(formatQuizSessionTime(data.end_time))} + {formatQuizSessionTime(data.end_time)}

diff --git a/utils/dateUtils.ts b/utils/dateUtils.ts index 809f1c2..83e35cf 100644 --- a/utils/dateUtils.ts +++ b/utils/dateUtils.ts @@ -30,16 +30,8 @@ export function formatCurrentTime(dateTimeStr: string) { } export function formatQuizSessionTime(dateTimeStr: string) { - const [time, period] = dateTimeStr.split(' '); - const [hours, minutes, seconds] = time.split(':'); - let hours24 = parseInt(hours, 10); - - if (period && period.toUpperCase() === 'PM') { - hours24 += 12; - } - - const formattedTime = `${String(hours24).padStart(2, "0")}:${minutes}`; - return formattedTime; + const time = new Date(`01/01/2000 ${dateTimeStr}`); + return time.toLocaleTimeString('en-US', { hour: 'numeric', minute: '2-digit' }); } export function formatTime(dateTimeStr: string) {