Skip to content

Add CT to RP Radio and Event Modal #117

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

Merged
miguelaenlle merged 1 commit into from
Sep 19, 2025
Merged

Add CT to RP Radio and Event Modal #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions apps/site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"formik": "^2.4.6",
"framer-motion": "11.3.23",
"lottie-react": "^2.4.1",
"moment-timezone": "^0.6.0",
"qrcode.react": "^4.2.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/site/src/components/Home/Schedule/EventModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
Text
} from "@chakra-ui/react";
import { Event } from "@rp/shared";
import moment from "moment";
import moment from "moment-timezone";
import { FaAward, FaClock, FaMapPin, FaTag } from "react-icons/fa";
import { AudioVisualizer } from "./AudioVisualizer";
import FoodMenu from "./FoodMenu";
Expand Down Expand Up @@ -145,8 +145,8 @@ function EventCard({ event }: { event: Event }) {
fontWeight="bold"
letterSpacing="0.5px"
>
{moment(event.startTime).format("h:mma")} –{" "}
{moment(event.endTime).format("h:mma")}
{moment(event.startTime).tz("America/Chicago").format("h:mma")} –{" "}
{moment(event.endTime).tz("America/Chicago").format("h:mma")} CT
</Text>
</Flex>
<Flex flex="1 1 0%" alignItems="center">
Expand Down
12 changes: 6 additions & 6 deletions apps/site/src/components/Home/Schedule/Schedule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
useToast
} from "@chakra-ui/react";
import { api, circleColors, DayEvent, Event, path } from "@rp/shared";
import moment from "moment";
import moment from "moment-timezone";
import { useCallback, useEffect, useState } from "react";

import { AnimatedHeader } from "../shared/AnimatedHeader";
Expand Down Expand Up @@ -201,8 +201,8 @@ export default function Schedule() {
}

function formatEventTime(iso: string): string {
const m = moment(iso);
const now = moment();
const m = moment(iso).tz("America/Chicago");
const now = moment().tz("America/Chicago");

if (m.isSame(now, "day")) {
return m.format("h:mma");
Expand All @@ -221,16 +221,16 @@ function formatEventTime(iso: string): string {
}

function formatEventRange(startIso: string, endIso: string): string {
const start = moment(startIso);
const end = moment(endIso);
const start = moment(startIso).tz("America/Chicago");
const end = moment(endIso).tz("America/Chicago");

const startLabel = formatEventTime(startIso);

const endLabel = start.isSame(end, "day")
? end.format("h:mma")
: formatEventTime(endIso);
Comment thread
miguelaenlle marked this conversation as resolved.

return `${startLabel} – ${endLabel}`;
return `${startLabel} – ${endLabel} CT`;
}

function DayEventsSection({
Expand Down
10 changes: 10 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1463,6 +1463,7 @@ __metadata:
formik: "npm:^2.4.6"
framer-motion: "npm:11.3.23"
lottie-react: "npm:^2.4.1"
moment-timezone: "npm:^0.6.0"
qrcode.react: "npm:^4.2.0"
react: "npm:^18.2.0"
react-dom: "npm:^18.2.0"
Expand Down Expand Up @@ -4417,6 +4418,15 @@ __metadata:
languageName: node
linkType: hard

"moment-timezone@npm:^0.6.0":
version: 0.6.0
resolution: "moment-timezone@npm:0.6.0"
dependencies:
moment: "npm:^2.29.4"
checksum: 10c0/16164cf321d8be0bf7d43855286b426c94c8200e0634f2e42cf469f591c6a230ac43f37d3826d76b05ac221f69a571400323fb8625e3d4e8669f4d9ab00fe779
languageName: node
linkType: hard

"moment@npm:^2.29.4, moment@npm:^2.30.1":
version: 2.30.1
resolution: "moment@npm:2.30.1"
Expand Down
Loading