Skip to content

Commit bf86981

Browse files
committed
Fix sorting desync
1 parent a98245c commit bf86981

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

pages/events.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ export default function Events(props: Props & { location: string }) {
8080
const endA = getEndTime(a, serverTimezone)
8181
const endB = getEndTime(b, serverTimezone)
8282

83+
if (!endA && !endB) return 0
8384
if (!endA) return 1
8485
if (!endB) return -1
8586

@@ -95,6 +96,7 @@ export default function Events(props: Props & { location: string }) {
9596
const startA = getStartTime(a, serverTimezone)
9697
const startB = getStartTime(b, serverTimezone)
9798

99+
if (!startA && !startB) return 0
98100
if (!startA) return 1
99101
if (!startB) return -1
100102

@@ -107,6 +109,7 @@ export default function Events(props: Props & { location: string }) {
107109
const startA = getStartTime(a, serverTimezone)
108110
const startB = getStartTime(b, serverTimezone)
109111

112+
if (!startA && !startB) return 0
110113
if (!startA) return -1
111114
if (!startB) return 1
112115

@@ -143,19 +146,19 @@ export default function Events(props: Props & { location: string }) {
143146
<h3 className="text-xl mt-3">Ongoing event{ongoing.length == 1 ? "" : "s"}</h3>
144147
<div className="flex flex-row flex-wrap pt-2 gap-2">
145148
{ongoing
146-
.map((event, i) => <EventCard key={i} e={event} now={now} serverTimezone={serverTimezone} hoverClass="hover:text-blue-800" className="dark:bg-green-500 bg-green-300 text-black" />)}
149+
.map((event, i) => <EventCard key={"ongoing"+i} e={event} now={now} serverTimezone={serverTimezone} hoverClass="hover:text-blue-800" className="dark:bg-green-500 bg-green-300 text-black" />)}
147150
</div>
148151

149152
<h3 className="text-xl mt-3">Upcoming event{upcoming.length == 1 ? "" : "s"}</h3>
150153
<div className="flex flex-row flex-wrap pt-2 gap-2">
151154
{upcoming
152-
.map((event, i) => <EventCard key={i} e={event} now={now} serverTimezone={serverTimezone} className="dark:bg-slate-800 bg-slate-300" />)}
155+
.map((event, i) => <EventCard key={"upcoming"+i} e={event} now={now} serverTimezone={serverTimezone} className="dark:bg-slate-800 bg-slate-300" />)}
153156
</div>
154157

155158
<h3 className="text-xl mt-3">Past event{past.length == 1 ? "" : "s"}</h3>
156159
{showPast ? <div className="flex flex-row flex-wrap pt-2 gap-2">
157160
{past
158-
.map((event, i) => <EventCard key={i} e={event} now={now} serverTimezone={serverTimezone} hoverClass="hover:text-blue-800" className="dark:bg-red-400 bg-red-300 text-black" />)}
161+
.map((event, i) => <EventCard key={"past"+i} e={event} now={now} serverTimezone={serverTimezone} hoverClass="hover:text-blue-800" className="dark:bg-red-400 bg-red-300 text-black" />)}
159162
</div> : <span className="bg-blue-500 text-slate-50 text-center rounded-lg mr-2 mt-1 px-1 py-0.5 cursor-pointer" onClick={() => setShowPast(true)}>Show past events</span>}
160163
</Main>
161164
)

0 commit comments

Comments
 (0)