UBC/Alley-HSBC-Frontend
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #73 from CPSC319-Winter-term-2/home

Browse Source 
Home
This commit is contained in:
Jincheng Lu 2022-03-30 22:49:52 -07:00 committed by GitHub
commit 3c9d8e4822
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/meeting-details/meeting-details-components/Body.tsx
View File

@ -48,6 +48,7 @@ const Body: React.FC<Props> = ({ meeting }) => {
); );
const parseIsoString = (s: string) => { const parseIsoString = (s: string) => {
const date: Date = new Date(s);
const month = [ const month = [
"January", "January",
"February", "February",
@ -61,10 +62,13 @@ const Body: React.FC<Props> = ({ meeting }) => {
"October", "October",
"November", "November",
"December", "December",
][parseInt(s.slice(5, 7)) - 1]; ][date.getMonth()];
const day = s.slice(8, 10); // ][parseInt(s.slice(5, 7)) - 1];
const isoTime: string = s.slice(11, 16); // const day = s.slice(8, 10);
const hour: number = parseInt(isoTime.slice(0, 2)); // const isoTime: string = s.slice(11, 16);
// const hour: number = parseInt(isoTime.slice(0, 2));
const day = date.getDate();
const hour: number = date.getHours();
const hourMod: string = hour % 12 == 0 ? "12" : (hour % 12).toString(); const hourMod: string = hour % 12 == 0 ? "12" : (hour % 12).toString();
return ( return (
month + month +
@ -73,7 +77,8 @@ const Body: React.FC<Props> = ({ meeting }) => {
", " + ", " +
hourMod + hourMod +
":" + ":" +
isoTime.slice(3, 5) + // isoTime.slice(3, 5) +
date.getMinutes() +
(hour > 11 ? "PM" : "AM") (hour > 11 ? "PM" : "AM")
); );
}; };

2
src/index.html
View File

@ -6,7 +6,7 @@
rel="stylesheet" rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
/> />
<title>Typescript React App</title> <title>Digital Walk-Around</title>
</head> </head>
<body> <body>
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>

11
src/utils.tsx
View File

@ -21,14 +21,9 @@ const getStatusColor = (ms: MeetingStatus): string => {
const formatTimeFromDate = (date: Date): string => { const formatTimeFromDate = (date: Date): string => {
let hour = date.getHours(); let hour = date.getHours();
let ampm = ""; let ampm = "";
const minutes = const minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : "" + date.getMinutes();
date.getMinutes() < 10 ? "0" + date.getMinutes() : "" + date.getMinutes(); ampm = hour < 12 ? "AM" : "PM";
if (hour < 12) { hour = hour % 12 == 0 ? 12 : (hour % 12);
ampm = "am";
} else {
hour = hour === 12 ? 12 : hour - 12;
ampm = "pm";
}
return hour + ":" + minutes + ampm; return hour + ":" + minutes + ampm;
}; };