+
-
+
-
{name}
-
{role}
-
{children}
+
{name}
+
{role}
+
{children}
>
diff --git a/content/meet-the-team/elections.mdx b/content/meet-the-team/elections.mdx
deleted file mode 100644
index f8fb38f1..00000000
--- a/content/meet-the-team/elections.mdx
+++ /dev/null
@@ -1,5 +0,0 @@
-To find out when and where the next elections will be held, keep an
-eye on on the [News](https://google.com).
-
-For details on the elections, read our
-[Constitution](/about/constitution).
diff --git a/content/meet-the-team/execs/02-gordon-le.md b/content/meet-the-team/execs/02-gordon-le.md
index 23c6a446..ea378d85 100644
--- a/content/meet-the-team/execs/02-gordon-le.md
+++ b/content/meet-the-team/execs/02-gordon-le.md
@@ -1,7 +1,7 @@
---
name: Gordon Le
role: Vice President
-image: /images/team/exec/Exec_GordonLe.jpg
+image: /images/team/exec/Exec_GordonLe.JPG
---
words words words codey words words words words codey words words words words codey words words words words codey words words words words codey words words words words words codey words words words words codey words words words words codey words words words words codey words words words
diff --git a/content/meet-the-team/programme-committee.json b/content/meet-the-team/programme-committee.json
index ffe44e01..c0320ce5 100644
--- a/content/meet-the-team/programme-committee.json
+++ b/content/meet-the-team/programme-committee.json
@@ -47,7 +47,7 @@
{
"name": "Yanni Wang",
"role": "Events",
- "image": "images/team/programme/Events_YanniWang.jpg"
+ "image": "images/team/programme/Events_YanniWang.JPG"
},
{
"name": "Anjing Li",
@@ -57,7 +57,7 @@
{
"name": "Patrick He",
"role": "Marketing",
- "image": "images/team/programme/Marketing_PatrickHe.png"
+ "image": "images/team/programme/Marketing_PatrickHe.PNG"
},
{
"name": "Richa Dalal",
diff --git a/content/meet-the-team/website-committee.json b/content/meet-the-team/website-committee.json
index b60f2e80..6bb9ef13 100644
--- a/content/meet-the-team/website-committee.json
+++ b/content/meet-the-team/website-committee.json
@@ -21,7 +21,7 @@
{
"name": "Catherine Wan",
"role": "Developer",
- "image": "images/team/website/Website_CatherineWan.jpg"
+ "image": "images/team/website/Website_CatherineWan.JPG"
},
{
"name": "Dora Su",
@@ -36,11 +36,11 @@
{
"name": "Linna Luo",
"role": "Developer",
- "image": "images/team/website/Website_LinnaLuo.jpg"
+ "image": "images/team/website/Website_LinnaLuo.JPG"
},
{
"name": "William Tran",
"role": "Developer",
- "image": "images/team/website/Website_WilliamTran.jpg"
+ "image": "images/team/website/Website_WilliamTran.JPG"
}
]
diff --git a/hooks/useWindowDimension.tsx b/hooks/useWindowDimension.tsx
index 9957a839..0b6924ea 100644
--- a/hooks/useWindowDimension.tsx
+++ b/hooks/useWindowDimension.tsx
@@ -13,7 +13,7 @@ function getWindowDimension() {
};
}
-function useWindowDimension(): WindowDimension {
+export function useWindowDimension(): WindowDimension {
const [windowSize, setWindowDimension] = useState
({
width: 0,
height: 0,
@@ -35,5 +35,3 @@ function useWindowDimension(): WindowDimension {
return windowSize;
}
-
-export default useWindowDimension;
diff --git a/lib/team.ts b/lib/team.ts
index e888181e..8f33db2f 100644
--- a/lib/team.ts
+++ b/lib/team.ts
@@ -18,7 +18,7 @@ export async function getExecNames() {
.map((name) => name.slice(0, -1 * fileType.length));
}
-export async function getExecContent(fileName: string, convert = true) {
+export async function getExec(fileName: string, convert = true) {
const raw = await readFile(path.join(EXECS_PATH, `${fileName}${fileType}`));
const { content, data: metadata } = matter(raw);
return {
diff --git a/package.json b/package.json
index 4c98a84a..432f02e4 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
"build": "next build",
"start": "next start",
"export": "next export",
- "lint": "eslint \"{pages,components,lib}/**/*.{js,ts,tsx,jsx}\" --quiet",
- "lint:fix": "eslint \"{pages,components,lib}/**/*.{js,ts,tsx,jsx}\" --quiet --fix"
+ "lint": "eslint \"{pages,components,lib,hooks}/**/*.{js,ts,tsx,jsx}\" --quiet",
+ "lint:fix": "eslint \"{pages,components,lib,hooks}/**/*.{js,ts,tsx,jsx}\" --quiet --fix"
},
"dependencies": {
"@mdx-js/loader": "^1.6.22",
diff --git a/pages/about/team.module.css b/pages/about/team.module.css
index dbf184eb..7a3f3231 100644
--- a/pages/about/team.module.css
+++ b/pages/about/team.module.css
@@ -1,8 +1,8 @@
-.header_container {
+.headerContainer {
display: flex;
flex-direction: row;
padding-bottom: calc(24rem / 16);
- border-bottom: calc(1rem / 16) solid var(--purple-2);
+ border-bottom: calc(1rem / 16) solid var(--primary-heading);
margin-bottom: calc(46rem / 16);
}
@@ -10,23 +10,24 @@
display: none;
}
-.header_text_container {
+.headerTextContainer {
margin: auto 0 0 0;
}
.header {
- color: var(--purple-2);
+ color: var(--primary-heading);
font-size: calc(48rem / 16);
margin: 0 calc(53rem / 16) 0 0;
}
.subheading {
- color: var(--purple-2);
+ color: var(--primary-heading);
font-size: calc(36rem / 16);
font-weight: 600;
padding-bottom: calc(22rem / 16);
- border-bottom: calc(1rem / 16) solid var(--purple-2);
+ border-bottom: calc(1rem / 16) solid var(--primary-heading);
margin-bottom: calc(46rem / 16);
+ margin-top: calc(86rem / 16);
}
.codey {
@@ -48,16 +49,12 @@
justify-items: center;
}
-.members:last-child {
- margin-bottom: calc(86rem / 16);
-}
-
.elections {
margin-top: 6rem;
}
-.election_subheading {
- color: var(--blue-2);
+.electionSubheading {
+ color: var(--primary-accent);
font-size: calc(36rem / 16);
font-weight: 600;
}
@@ -68,7 +65,7 @@
}
@media only screen and (max-width: calc(768rem / 16)) {
- .header_container {
+ .headerContainer {
flex-direction: column-reverse;
padding-bottom: 1rem;
}
@@ -113,7 +110,7 @@
padding: 2rem;
}
- .election_subheading {
+ .electionSubheading {
font-size: calc(24rem / 16);
}
}
diff --git a/pages/about/team.tsx b/pages/about/team.tsx
index f7487105..cafb829b 100644
--- a/pages/about/team.tsx
+++ b/pages/about/team.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { getExecContent, getExecNames, Metadata } from "../../lib/team";
+import { getExec, getExecNames, Metadata } from "../../lib/team";
import { MDXRemote, MDXRemoteSerializeResult } from "next-mdx-remote";
import { GetStaticProps } from "next";
import { Image } from "../../components/Image";
@@ -7,7 +7,6 @@ import { TeamMemberCard } from "../../components/TeamMemberCard";
import { TeamMember } from "../../components/TeamMember";
import { Link } from "../../components/Link";
import { Bubble } from "../../components/Bubble";
-import ElectionContent from "../../content/meet-the-team/elections.mdx";
import programme from "../../content/meet-the-team/programme-committee.json";
import website from "../../content/meet-the-team/website-committee.json";
import systems from "../../content/meet-the-team/systems-committee.json";
@@ -25,11 +24,11 @@ interface Props {
execs: SerializedExec[];
}
-export default function MeetTheTeam({ execs }: Props) {
+export default function Team({ execs }: Props) {
return (
<>
-
-
+
+
Meet the Team!
The Executives
@@ -57,22 +56,25 @@ export default function MeetTheTeam({ execs }: Props) {
);
})}
-
+
Programme Committee
-
+
Website Committee
-
+
Systems Committee
-
Elections
-
+ Elections
+ To find out when and where the next elections will be held, keep an
+ eye on on the News.
+ For details on the elections, read our
+ Constitution
>
@@ -96,7 +98,7 @@ function MembersList(props: MembersProps) {
export const getStaticProps: GetStaticProps
= async () => {
const execNames = await getExecNames();
const execs = (await Promise.all(
- execNames.map((name) => getExecContent(name))
+ execNames.map((name) => getExec(name))
)) as SerializedExec[];
return {
diff --git a/public/images/team/exec/Exec_RavinduAngammana.jpg b/public/images/team/exec/Exec_RavinduAngammana.jpg
deleted file mode 100644
index 8dc7edc3..00000000
Binary files a/public/images/team/exec/Exec_RavinduAngammana.jpg and /dev/null differ
diff --git a/public/images/team/systems/Syscom_AnshDhingra.jpeg b/public/images/team/systems/Syscom_AnshDhingra.jpeg
deleted file mode 100644
index 5d94b64b..00000000
Binary files a/public/images/team/systems/Syscom_AnshDhingra.jpeg and /dev/null differ