diff --git a/lib/events.ts b/lib/events.ts index c73a4522..bf61fe8f 100644 --- a/lib/events.ts +++ b/lib/events.ts @@ -6,15 +6,19 @@ import { MDXRemoteSerializeResult } from "next-mdx-remote"; import { serialize } from "next-mdx-remote/serialize"; const EVENTS_PATH = path.join("content", "events"); +const TERMS = ["winter", "spring", "fall"]; export async function getYears(): Promise { return (await fs.readdir(EVENTS_PATH, { withFileTypes: true })) .filter((dirent) => dirent.isDirectory()) - .map((dirent) => dirent.name); + .map((dirent) => dirent.name) + .sort(); } export async function getTermsByYear(year: string): Promise { - return await fs.readdir(path.join(EVENTS_PATH, year)); + return (await fs.readdir(path.join(EVENTS_PATH, year))).sort( + (a, b) => TERMS.indexOf(a) - TERMS.indexOf(b) + ); } interface Metadata { diff --git a/pages/events/[year]/index.tsx b/pages/events/[year]/index.tsx index cbc33aa0..a14a8530 100644 --- a/pages/events/[year]/index.tsx +++ b/pages/events/[year]/index.tsx @@ -15,7 +15,6 @@ export async function getStaticPaths(): Promise<{ const paths = years.map((curYear) => ({ params: { year: curYear }, })); - console.log(paths); return { paths: paths, fallback: false, @@ -56,7 +55,7 @@ const Year = (props: Props) => {
{props.terms.map((term) => ( - + {`${term.charAt(0).toUpperCase()}${term.slice(1)}`} ))} diff --git a/pages/events/[year]/year.module.css b/pages/events/[year]/year.module.css index 6e929318..f9f1d266 100644 --- a/pages/events/[year]/year.module.css +++ b/pages/events/[year]/year.module.css @@ -8,11 +8,11 @@ .heading2 { font-weight: 700; font-size: 2.25rem; - color: var(--purple-2); + color: var(--primary-heading); } .blue { - color: var(--blue-2) + color: var(--primary-accent) } .links {