Skip to content

Show random sessions if no upcoming; Don't show spin progress outside event dates #55

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
merged 1 commit into from
Feb 23, 2025
Merged

Show random sessions if no upcoming; Don't show spin progress outside event dates #55

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
28 changes: 23 additions & 5 deletions src/app/(authenticated)/home/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,20 @@ export default async function Home() {
const companies = await CompanyService.getCompanies();
const speakers = await SpeakerService.getSpeakers();

// choose upcoming sessions
// choose upcoming or random sessions
const tenMinutesEarlier = new Date(new Date().getTime() - 10 * 60 * 1000);
const upcomingSessions: SINFOSession[] = eventSessions
? eventSessions
.filter((s) => new Date(s.date) >= tenMinutesEarlier)
.sort((a, b) => new Date(a.date).getTime() - new Date(b.date).getTime())
.slice(0, N_SESSION_TILES)
: [];
const highlightedSessions =
upcomingSessions.length > 0
? upcomingSessions
: (eventSessions
?.sort(() => Math.random() - 0.5)
.slice(0, N_SESSION_TILES) ?? []);

// choose random companies
const highlightedCompanies: Company[] = companies
Expand All @@ -50,9 +56,15 @@ export default async function Home() {
? speakers.sort(() => Math.random() - 0.5).slice(0, N_SPEAKER_TILES)
: [];

let standDates = new Set(
companies?.flatMap(
(c) => c.stands?.flatMap((cs) => cs.date.slice(0, 10)) ?? []
) ?? []
);
let today = new Date().toISOString().split("T")[0];
const spinWheelData = getUserActiveSignatureData(user, event?.id ?? ``);
const showSpinWheelSection =
isAttendee(user.role) && !spinWheelData?.redeemed;
standDates.has(today) && isAttendee(user.role) && !spinWheelData?.redeemed;

return (
<div className="container mx-auto">
Expand All @@ -78,9 +90,15 @@ export default async function Home() {
)}

{/* Upcoming Sessions */}
<List title="Next Up" link="/schedule?day=today" linkText="See all">
{upcomingSessions.length > 0 ? (
upcomingSessions.map((s) => <SessionTile key={s.id} session={s} />)
<List
title={upcomingSessions.length > 0 ? "Next Up" : "Sessions"}
link="/schedule?day=today"
linkText="See all"
>
{highlightedSessions.length > 0 ? (
highlightedSessions.map((s) => (
<SessionTile key={s.id} session={s} indicatePastSession={false} />
))
) : (
<ListCard title="Nothing to show" />
)}
Expand Down
6 changes: 5 additions & 1 deletion src/components/session/SessionTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ import { generateTimeInterval, getSessionColor } from "@/utils/utils";
interface SesionTileProps {
session: SINFOSession;
onlyShowHours?: boolean;
indicatePastSession?: boolean;
}

export function SessionTile({
session,
onlyShowHours = false,
indicatePastSession = true,
}: SesionTileProps) {
const speakersNames = session.speakers
?.map((s) => s.name)
Expand All @@ -32,7 +34,9 @@ export function SessionTile({
labelColor={getSessionColor(session.kind)}
link={`/sessions/${session.id}`}
extraClassName={
pastSession ? "!bg-neutral-200 hover:!bg-neutral-300" : ""
indicatePastSession && pastSession
? "!bg-neutral-200 hover:!bg-neutral-300"
: undefined
}
/>
);
Expand Down