Skip to content

Fix bug allowing past events to display as "Today" #185

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

Open
baconjuggling wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix bug allowing past events to display as "Today" #185

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
114 changes: 59 additions & 55 deletions src/components/EventsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import useSWR from "swr";
import { fetcher } from "src/fetcher";
import { differenceInDays, format } from "date-fns";
import siteConfig from "site.config";
import { fetcher } from "src/fetcher";
import useSWR from "swr";

type Props = {
endpoint: string; // endpoint to call for event info
Expand All @@ -12,8 +12,8 @@ const meetupAPIEndpoint = `${siteConfig.meetupSrc}?limit=${siteConfig.meetupEven

export default function EventsList({ initialData, endpoint }: Props) {
const { data, error } = useSWR<MeetupEvent[]>(meetupAPIEndpoint, fetcher, {
initialData,
});
initialData,
});

if (error)
return (
Expand All @@ -40,70 +40,74 @@ export default function EventsList({ initialData, endpoint }: Props) {

return (
<ul className="grid sm:grid-cols-2 lg:grid-cols-3 gap-4">
{data.slice(0, 9).map((event) => {
const currentDate = new Date();
const dateOfEvent = new Date(event.time);
const dateDifference = differenceInDays(dateOfEvent, currentDate);

let formattedDateOfEvent;
{
data.filter((event ) => event.status === "upcoming")
.slice(0, 9)

.map((event ) => {
const currentDate = new Date();
const dateOfEvent = new Date(event.time);
const dateDifference = differenceInDays(dateOfEvent, currentDate);

let formattedDateOfEvent;

if (dateDifference < 1) {
formattedDateOfEvent = `Today, ${format(
formattedDateOfEvent = `Today, ${format(
new Date(event.time),
"do LLL "
)}`;
)}`;
} else if (dateDifference < 2) {
formattedDateOfEvent = `Tomorrow, ${format(
formattedDateOfEvent = `Tomorrow, ${format(
new Date(event.time),
"do LLL"
)}`;
"do LLL"
)}`;
} else if (dateDifference < 7) {
formattedDateOfEvent = `This ${format(
formattedDateOfEvent = `This ${format(
new Date(event.time),
"eeee, do LLL"
)}`;
"eeee, do LLL"
)}`;
} else if (dateDifference < 14) {
formattedDateOfEvent = `Next ${format(
formattedDateOfEvent = `Next ${format(
new Date(event.time),
"eeee, do LLL "
)}`;
} else {
formattedDateOfEvent = format(
)}`;
} else {
formattedDateOfEvent = format(
new Date(event.time),
"eeee, do LLL yyyy"
);
}
"eeee, do LLL yyyy"
);
}

return (
<li
key={event.id}
className="block bg-background-secondary rounded leading-tight tracking-tight"
>
<a href={event.link} className="p-4 block hover:outline">
<h3 className="font-bold text-lg">
<span role="img" aria-label="calendar">
📆
</span>
&nbsp;{event.name}
</h3>
<p className="text-foreground-secondary mt-2 font-bold">
{formattedDateOfEvent}
</p>
<p className="mt-1 text-foreground-secondary">
{format(new Date(event.time), "HH:mm")} to{" "}
{format(new Date(event.time + event.duration), "HH:mm")}
</p>
<p className="text-href-base mt-1 font-bold">RSVP &raquo;</p>
<p className="text-sm mt-1 text-foreground-tertiary">
{event.yes_rsvp_count}
{event.rsvp_limit
? ` / ${event.rsvp_limit}`
: null} attending{" "}
</p>
</a>
</li>
);
})}
return (
<li
key={event.id}
className="block bg-background-secondary rounded leading-tight tracking-tight"
>
<a href={event.link} className="p-4 block hover:outline">
<h3 className="font-bold text-lg">
<span role="img" aria-label="calendar">
📆
</span>
&nbsp;{event.name}
</h3>
<p className="text-foreground-secondary mt-2 font-bold">
{formattedDateOfEvent}
</p>
<p className="mt-1 text-foreground-secondary">
{format(new Date(event.time), "HH:mm")} to{" "}
{format(new Date(event.time + event.duration), "HH:mm")}
</p>
<p className="text-href-base mt-1 font-bold">RSVP &raquo;</p>
<p className="text-sm mt-1 text-foreground-tertiary">
{event.yes_rsvp_count}
{event.rsvp_limit
? ` / ${event.rsvp_limit}`
: null} attending{" "}
</p>
</a>
</li>
);
})}
</ul>
);
}
Expand Down