diff --git a/next.config.js b/next.config.js index aab94161..b7168577 100644 --- a/next.config.js +++ b/next.config.js @@ -15,6 +15,10 @@ module.exports = { 'jcfp.site', 'photos.google.com', 'photos.app.goo.gl', + 't4.ftcdn.net', + 'www.acmcyber.com', + 'media.licdn.com', + 'github.com', 'www.uclaacm.com', 'raw.githubusercontent.com', ], diff --git a/pages/about.js b/pages/about.js index b0a91693..ed11fda0 100644 --- a/pages/about.js +++ b/pages/about.js @@ -6,8 +6,9 @@ import React from 'react'; import Banner from '../components/Banner'; import Layout from '../components/Layout'; import Officers from '../components/OfficerCard'; +// import Officers from '../components/Officers/OfficerCard'; import SocialMedia from '../components/SocialMedia'; -import data from '../data'; +import data from '../offoutput.json'; import acmCommittees from '../public/images/acm_committees.png'; import boardcollage from '../public/images/boardcollage.png'; @@ -15,8 +16,22 @@ import acmHowToJoin from '../public/images/how-to-join.png'; import initiative from '../public/images/initiative.png'; import styles from '../styles/pages/About.module.scss'; + +function extractContent(officerContent) { + const convertedData = officerContent.map(officer => ({ + name: officer.name, + pronouns: officer.pronouns, + position: (officer.role === officer.committee ? officer.role : officer.role + ', ' + officer.committee), + committee: officer.committee, + major: officer.major, + year: officer.year, + img: officer.photo, + })).filter(officer => officer.position.includes('President')); + return convertedData; +} + function About() { - const { leadership } = data; + const filteredOfficers = extractContent(data); return ( Our President and Internal/External Vice Presidents support the entire ACM community while our committee presidents foster the growth of their committee.

- +