www
/
www-new
12
3
Fork 5
Code Issues 58 Pull Requests 42 Projects Releases Wiki Activity

Fix logic, add section
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Jared He 2021-08-31 21:59:24 -05:00
parent ad38eca98b
commit 6256fe0dcd
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/events.ts
View File

@ -191,11 +191,11 @@ export function getCurrentTerm(): { year: string; term: string } {
term = "winter";
} else if (
new Date(`${year}-05-01 EST`).getTime() <= date.getTime() &&
date.getTime() <= new Date(`${year}-08-31 EST`).getTime()
date.getTime() <= new Date(`${year}-09-02 EST`).getTime()
) {
term = "spring";
} else if (
new Date(`${year}-09-01 EST`).getTime() <= date.getTime() &&
new Date(`${year}-09-03 EST`).getTime() <= date.getTime() &&
date.getTime() <= new Date(`${year}-12-31 EST`).getTime()
) {
term = "fall";

36
pages/events/[year]/[term]/index.tsx
View File

@ -99,12 +99,24 @@ export default function Term(props: Props) {
</section>
)}
{hasPastEvents && !props.isCurrentTerm && (
<h1>
Events Archive:
<span className={styles.blue}>
{` ${capitalize(props.term)} ${props.year}`}
</span>
</h1>
<section>
<h1>
Events Archive:
<span className={styles.blue}>
{` ${capitalize(props.term)} ${props.year}`}
</span>
</h1>
<div className={styles.miniEventCards}>
{props.pastEvents.map(({ content, metadata }) => (
<MiniEventCard
{...metadata}
date={new Date(metadata.date)}
description={<MDXRemote {...content} />}
key={metadata.name + metadata.date.toString()}
/>
))}
</div>
</section>
)}
{!hasFutureEvents && !hasPastEvents && (
<>
@ -114,18 +126,6 @@ export default function Term(props: Props) {
later!
</>
)}
{!hasPastEvents && !props.isCurrentTerm && (
<div className={styles.miniEventCards}>
{props.pastEvents.map(({ content, metadata }) => (
<MiniEventCard
{...metadata}
date={new Date(metadata.date)}
description={<MDXRemote {...content} />}
key={metadata.name + metadata.date.toString()}
/>
))}
</div>
)}
</div>
);
}