Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Show time in 12hr format #43

Merged
merged 2 commits into from
Mar 22, 2024
Merged

Feat: Show time in 12hr format #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95708f9
show 12 hr format
Bahugunajii Mar 22, 2024
e3d075e
code optimization
Bahugunajii Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function Home() {
const [liveClasses, setLiveClasses] = useState<SessionSchedule[]>([]);
const [isLoading, setIsLoading] = useState(true);
const [quizzes, setQuizzes] = useState<QuizSession[]>([]);
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();
Expand Down Expand Up @@ -105,7 +105,7 @@ export default function Home() {
return (
<p className="text-xs italic font-normal mr-4">
Starts at <br />
{sessionStartTimeStr}
{formatTime(sessionStartTimeStr)}
</p>
);
}
Expand All @@ -122,7 +122,7 @@ export default function Home() {
return (
<p className="text-xs italic font-normal mr-4">
Starts at <br />
{sessionStartTimeStr}
{formatTime(sessionStartTimeStr)}
</p>
);
}
Expand Down
16 changes: 4 additions & 12 deletions utils/dateUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,13 @@ 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) {
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 {
Expand Down
Loading