From 635c41e33a4a12eccc1d8c5fc91e3f0936e83780 Mon Sep 17 00:00:00 2001 From: Lucas Date: Thu, 18 Jan 2024 01:19:17 +1100 Subject: [PATCH] Update the team page for 2024 (#58) * Protect sensitive payment or personal pages from scrapers * Add 2024 team * Update spacing * Hide 1st year roles for 2024 * Rearrange directors by subcommittee name * Update director titles * Update IT subcommittee description * Fix build * Address PR comments * Fix description * Refactor description conditional for team page --- components/nominations/NomineeModal.jsx | 2 +- components/team/ExecCard.jsx | 19 +- components/team/ExecSection.jsx | 2 +- components/team/Subcom.jsx | 11 +- data/NominationsData.js | 39 +- data/NominationsData.old.js | 363 ------------------ data/TeamData.js | 211 +++++++++- next.config.js | 5 +- pages/merch.txt | 1 + pages/nominations.jsx | 1 + pages/passwords.jsx | 17 - pages/publications.jsx | 2 +- pages/team.jsx | 6 +- public/img/exec/2023/Jack.jpg | Bin 39623 -> 48459 bytes .../{nominee/Alex.JPG => exec/2024/Alex.jpg} | Bin public/img/{nominee => exec/2024}/Amal.jpg | Bin public/img/{nominee => exec/2024}/Anna.jpg | Bin public/img/{nominee => exec/2024}/Arya.jpg | Bin public/img/{nominee => exec/2024}/Dinara.jpg | Bin .../Doris.JPG => exec/2024/Doris.jpg} | Bin .../img/{nominee => exec/2024}/Franklin.png | Bin public/img/{nominee => exec/2024}/Imogen.png | Bin public/img/{nominee => exec/2024}/Inika.jpg | Bin .../Kelly.JPG => exec/2024/Kelly.jpg} | Bin public/img/{nominee => exec/2024}/Kiran.jpeg | Bin public/img/{nominee => exec/2024}/Lucas.jpg | Bin public/img/{nominee => exec/2024}/Maggie.jpg | Bin public/img/{nominee => exec/2024}/Matthew.jpg | Bin .../img/{nominee => exec/2024}/Nicholas.png | Bin public/img/{nominee => exec/2024}/Peter.png | Bin public/img/{nominee => exec/2024}/Sam.jpg | Bin .../img/{nominee => exec/2024}/Sebastian.png | Bin public/img/{nominee => exec/2024}/Sienna.png | Bin public/img/nominee/Maggie.heic | Bin 52840 -> 0 bytes public/robots.txt | 3 + public/scripts/test.js | 7 - styles/modules/ExecCard.module.scss | 52 +-- yarn.lock | 6 +- 38 files changed, 266 insertions(+), 481 deletions(-) delete mode 100644 data/NominationsData.old.js delete mode 100644 pages/passwords.jsx rename public/img/{nominee/Alex.JPG => exec/2024/Alex.jpg} (100%) rename public/img/{nominee => exec/2024}/Amal.jpg (100%) rename public/img/{nominee => exec/2024}/Anna.jpg (100%) rename public/img/{nominee => exec/2024}/Arya.jpg (100%) rename public/img/{nominee => exec/2024}/Dinara.jpg (100%) rename public/img/{nominee/Doris.JPG => exec/2024/Doris.jpg} (100%) rename public/img/{nominee => exec/2024}/Franklin.png (100%) rename public/img/{nominee => exec/2024}/Imogen.png (100%) rename public/img/{nominee => exec/2024}/Inika.jpg (100%) rename public/img/{nominee/Kelly.JPG => exec/2024/Kelly.jpg} (100%) rename public/img/{nominee => exec/2024}/Kiran.jpeg (100%) rename public/img/{nominee => exec/2024}/Lucas.jpg (100%) rename public/img/{nominee => exec/2024}/Maggie.jpg (100%) rename public/img/{nominee => exec/2024}/Matthew.jpg (100%) rename public/img/{nominee => exec/2024}/Nicholas.png (100%) rename public/img/{nominee => exec/2024}/Peter.png (100%) rename public/img/{nominee => exec/2024}/Sam.jpg (100%) rename public/img/{nominee => exec/2024}/Sebastian.png (100%) rename public/img/{nominee => exec/2024}/Sienna.png (100%) delete mode 100644 public/img/nominee/Maggie.heic create mode 100644 public/robots.txt delete mode 100644 public/scripts/test.js diff --git a/components/nominations/NomineeModal.jsx b/components/nominations/NomineeModal.jsx index 39ef47e..68b537d 100644 --- a/components/nominations/NomineeModal.jsx +++ b/components/nominations/NomineeModal.jsx @@ -36,7 +36,7 @@ const NomineeModal = ({ data, roles, isOpen, toggle }) => { {data.description !== undefined && data.description.split("\n").map((paragraph) => ( <> -

{paragraph}

+

{paragraph}


))} diff --git a/components/team/ExecCard.jsx b/components/team/ExecCard.jsx index 39523d7..06f86d3 100644 --- a/components/team/ExecCard.jsx +++ b/components/team/ExecCard.jsx @@ -3,27 +3,26 @@ import Image from "next/image"; import styles from "styles/modules/ExecCard.module.scss"; -// TODO: consider separating into component that's more generic, and having -// ExecCard inherit from that +// TODO: consider separating into component that's more generic, and having ExecCard inherit from that const ExecCard = ({ data, colour }) => { const { name, image, description, role } = data; - // TODO: fix description not showing return (
-
- {name} -
-
-
+ {description && ( + <> +
+

{description}

+ + )} + {name}
-
+

{name}

{role === "" ? null :

{role}

} - {/* {description === "" ? null :

{description}

} */}
); diff --git a/components/team/ExecSection.jsx b/components/team/ExecSection.jsx index c002a17..e1b64d6 100644 --- a/components/team/ExecSection.jsx +++ b/components/team/ExecSection.jsx @@ -22,7 +22,7 @@ const ExecSection = ({ section }) => { return ( <>
- +

{section.sectionName}

{section.members.map((row, rowIndex) => ( diff --git a/components/team/Subcom.jsx b/components/team/Subcom.jsx index 259e8fa..374f7c1 100644 --- a/components/team/Subcom.jsx +++ b/components/team/Subcom.jsx @@ -1,14 +1,11 @@ import React from "react"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -// import styles from "styles/modules/Subcom.module.scss"; // TODO: centre left column (col-sm-8) - const Subcom = ({ portfolio }) => { return ( <> -
- {/*
*/} -
+
+
{portfolio.icons.map((icon, index) => ( { className="m-2" /> ))} -
+

{portfolio.name}

{portfolio.description}

-
+