Merge pull request #57 from purduehackers/matthew/clearer-time-format…

…ting

Clearer time formatting for Hack Night

components/event-card.tsx

@@ -1,5 +1,6 @@
 import { format as formatDate } from 'date-fns'
 import Link from 'next/link'
+import { startTimeFormatString } from '../lib/formatDate'
 import { past } from '../lib/past'
 
 const EventCard = ({
@@ -31,7 +32,7 @@ const EventCard = ({
             )}{' '}
         {start === 'TBD'
           ? ''
-          : formatDate(new Date(start), `h:mm${end === 'TBD' ? ' a' : ''}`) +
+          : formatDate(new Date(start), startTimeFormatString(start, end)) +
             '—'}
         {end === 'TBD' ? '???' : formatDate(new Date(end), 'h:mm a')}
       </p>

components/past-event.tsx

@@ -1,7 +1,7 @@
 import Head from 'next/head'
 import { Clock } from 'react-feather'
 import { format as formatDate } from 'date-fns'
-import { formatDateTz } from '../lib/formatDateTz'
+import { formatDateTz, startTimeFormatString } from '../lib/formatDate'
 import Nav from './nav'
 import Footer from './footer'
 import FooterLinks from './footer-links'
@@ -68,7 +68,10 @@ const PastEvent = ({ event }: { event: PHEvent }) => {
                 : formatDate(new Date(event.start), 'LLL do, Y •')}{' '}
               {event.start === 'TBD'
                 ? ''
-                : formatDate(new Date(event.start), 'h:mm') + '—'}
+                : formatDate(
+                    new Date(event.start),
+                    startTimeFormatString(event.start, event.end)
+                  ) + '—'}
               {event.end === 'TBD'
                 ? ''
                 : formatDate(new Date(event.end), 'h:mm a')}

components/upcoming-event.tsx

@@ -9,7 +9,7 @@ import { footer } from '../lib/footerPonderings'
 import { useEffect, useState } from 'react'
 import FooterLinks from './footer-links'
 import Nav from './nav'
-import { formatDateTz } from '../lib/formatDateTz'
+import { formatDateTz, startTimeFormatString } from '../lib/formatDate'
 import VercelBanner from './vercel-banner'
 import DescriptionBox from './desc-box'
 
@@ -72,13 +72,13 @@ const UpcomingEvent = ({ event }: { event: PHEvent }) => {
                 ? 'Date TBD'
                 : formatDate(
                     new Date(event.start),
-                    `${past(event.start) ? 'LLL do, y' : 'EEEE, LLL do •'}`
+                    `${past(event.start) ? 'LLL do, y •' : 'EEEE, LLL do •'}`
                   )}{' '}
               {event.start === 'TBD'
                 ? ''
                 : formatDate(
                     new Date(event.start),
-                    `h:mm${event.end === 'TBD' ? ' a' : ''}`
+                    startTimeFormatString(event.start, event.end)
                   ) + '—'}
               {event.end === 'TBD'
                 ? '???'

lib/formatDate.ts

@@ -0,0 +1,19 @@
+export const formatDateTz = (date: Date, tzString: string) =>
+  new Date(date.toLocaleString('en-US', { timeZone: tzString }))
+
+export const eventSpansAcrossMultipleDays = (
+  start: string,
+  end: string
+): boolean => {
+  const startDate = new Date(start).getDate()
+  const endDate = new Date(end).getDate()
+  return startDate !== endDate
+}
+
+export const startTimeFormatString = (start: string, end: string): string => {
+  let baseString = 'h:mm'
+  if (end === 'TBD' || eventSpansAcrossMultipleDays(start, end)) {
+    baseString += ' a'
+  }
+  return baseString
+}

pages/api/sendReminder.ts

@@ -4,7 +4,7 @@ import { NextApiRequest, NextApiResponse } from 'next'
 import { createClient } from 'next-sanity'
 
 import { fetchEvents } from '../../lib/fetchEvents'
-import { formatDateTz } from '../../lib/formatDateTz'
+import { formatDateTz } from '../../lib/formatDate'
 import { past } from '../../lib/past'
 
 const client = createClient({