{
}
interface Metadata {
+ slug: string;
name: string;
+ poster?: string;
short: string;
date: string;
online: boolean;
@@ -52,7 +54,7 @@ export async function getEventBySlug(
return {
content: await serialize(content),
- metadata: metadata as Metadata,
+ metadata: { ...metadata, slug } as Metadata,
};
}
@@ -122,12 +124,14 @@ export async function getEventsPageProps({
new Date(a.metadata.date).getTime() - new Date(b.metadata.date).getTime()
);
+ const currentDate = Date.now();
+
const pastEvents = events
- .filter((event) => new Date(event.metadata.date).getTime() < Date.now())
+ .filter((event) => new Date(event.metadata.date).getTime() < currentDate)
.reverse();
const futureEvents = events.filter(
- (event) => new Date(event.metadata.date).getTime() >= Date.now()
+ (event) => new Date(event.metadata.date).getTime() >= currentDate
);
const current = getCurrentTerm();
diff --git a/pages/_app.tsx b/pages/_app.tsx
index e705b5ec..71f1a530 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -8,6 +8,7 @@ import { Code } from "@/components/Code";
import { DefaultLayout } from "@/components/DefaultLayout";
import { Footer } from "@/components/Footer";
import { HorizontalLine } from "@/components/HorizontalLine";
+import { Image } from "@/components/Image";
import { Link } from "@/components/Link";
import { Navbar } from "@/components/Navbar";
import { Pre } from "@/components/Pre";
@@ -35,6 +36,7 @@ export default function App({ Component, pageProps }: AppProps): JSX.Element {
button: Button,
pre: Pre,
inlineCode: Code,
+ img: Image,
}}
>
diff --git a/pages/events/[year]/[term]/[event].tsx b/pages/events/[year]/[term]/[event].tsx
index 21bfce26..193d4725 100644
--- a/pages/events/[year]/[term]/[event].tsx
+++ b/pages/events/[year]/[term]/[event].tsx
@@ -18,6 +18,7 @@ export default function EventInfoPage(props: Props) {
diff --git a/pages/events/[year]/[term]/index.module.css b/pages/events/[year]/[term]/index.module.css
index ab651690..ce7de862 100644
--- a/pages/events/[year]/[term]/index.module.css
+++ b/pages/events/[year]/[term]/index.module.css
@@ -8,12 +8,6 @@
border-bottom: 1px solid var(--primary-heading);
}
-@media only screen and (max-width: calc(768rem / 16)) {
- .main {
- margin-top: calc(60rem / 16);
- }
-}
-
.header a {
color: var(--text);
font-size: calc(18rem / 16);
@@ -31,3 +25,7 @@
.miniEventCards {
margin-top: calc(30rem / 16);
}
+
+.main > .miniEventCards {
+ margin-top: 0;
+}
diff --git a/pages/events/[year]/[term]/index.tsx b/pages/events/[year]/[term]/index.tsx
index f8b9f1fd..c0b1b670 100644
--- a/pages/events/[year]/[term]/index.tsx
+++ b/pages/events/[year]/[term]/index.tsx
@@ -72,6 +72,7 @@ export default function Term(props: Props) {
{...metadata}
date={new Date(metadata.date)}
key={metadata.name + metadata.date.toString()}
+ link={`/events/${props.year}/${props.term}/${metadata.slug}`}
>