From d41a6ba3b439c042ff0d27efd93a39cdb00d0536 Mon Sep 17 00:00:00 2001 From: Pranav Puranam Date: Wed, 8 May 2024 11:52:43 -0700 Subject: [PATCH 01/15] use spreadsheet data instead of hardcoded --- next.config.js | 7 +++++++ pages/about.js | 24 +++++++++++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/next.config.js b/next.config.js index c4f4e9d4..29fa2c53 100644 --- a/next.config.js +++ b/next.config.js @@ -15,6 +15,13 @@ module.exports = { 'jcfp.site', 'photos.google.com', 'photos.app.goo.gl', + 't4.ftcdn.net', + 'ca.slack-edge.com', + 'www.acmcyber.com', + 'www.bliu.tech', + 'r2dev2.github.io', + 'media.licdn.com', + 'github.com', ], }, target: 'serverless', diff --git a/pages/about.js b/pages/about.js index b0a91693..20bb7950 100644 --- a/pages/about.js +++ b/pages/about.js @@ -6,17 +6,35 @@ 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 acmCommittees from '../public/images/acm_committees.png'; import boardcollage from '../public/images/boardcollage.png'; import acmHowToJoin from '../public/images/how-to-join.png'; import initiative from '../public/images/initiative.png'; import styles from '../styles/pages/About.module.scss'; +import newData from '../scripts/offoutput.json'; + +// should filter both the names for about along with put data in the right format +function extractContent(officerContent) { + const includedOfficers = ['Nyla Zia', 'Meryl Mathew', 'Larry Zhi', 'Jenna Wang', 'Shiyu Ye', 'Gregor MacDonald', 'Maxine Wu', 'Nemi Desai', + 'Sananshi Pidyar', 'William Zhao', 'Joanna Liu', 'Aaron Kwan', 'Jason An', 'Savannah Alanis', 'Leroy Betterton Gage', + 'Vera Peker', 'Natalie Lord', 'Tiffany Zheng', 'Edward Ng']; + const convertedData = officerContent.map(officer => ({ + name: officer.name, + pronouns: officer.pronouns, + position: officer.role, + committee: officer.committee, + major: officer.major, + year: officer.year, + img: officer.photo, + })).filter(officer => includedOfficers.includes(officer.name)); + return convertedData; +} function About() { - const { leadership } = data; + const convD = extractContent(newData); return ( Our President and Internal/External Vice Presidents support the entire ACM community while our committee presidents foster the growth of their committee.

- +
From 6e7ad474f510691d3f48c7da3c31dd588fc2c5de Mon Sep 17 00:00:00 2001 From: Pranav Puranam Date: Wed, 8 May 2024 18:47:31 -0700 Subject: [PATCH 02/15] filter by officer name --- pages/about.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pages/about.js b/pages/about.js index 20bb7950..2ae8501c 100644 --- a/pages/about.js +++ b/pages/about.js @@ -14,12 +14,11 @@ import boardcollage from '../public/images/boardcollage.png'; import acmHowToJoin from '../public/images/how-to-join.png'; import initiative from '../public/images/initiative.png'; import styles from '../styles/pages/About.module.scss'; -import newData from '../scripts/offoutput.json'; +import data from '../scripts/offoutput.json'; -// should filter both the names for about along with put data in the right format function extractContent(officerContent) { const includedOfficers = ['Nyla Zia', 'Meryl Mathew', 'Larry Zhi', 'Jenna Wang', 'Shiyu Ye', 'Gregor MacDonald', 'Maxine Wu', 'Nemi Desai', - 'Sananshi Pidyar', 'William Zhao', 'Joanna Liu', 'Aaron Kwan', 'Jason An', 'Savannah Alanis', 'Leroy Betterton Gage', + 'Sananshi Pidyar', 'William Zhao', 'Joanna Liu', 'Aaron Kwan', 'Jason An', 'Savannah Alanis', 'Leroy Betterton Gage', 'Vera Peker', 'Natalie Lord', 'Tiffany Zheng', 'Edward Ng']; const convertedData = officerContent.map(officer => ({ name: officer.name, @@ -34,7 +33,7 @@ function extractContent(officerContent) { } function About() { - const convD = extractContent(newData); + const convD = extractContent(data); return ( Date: Wed, 29 May 2024 16:02:46 -0700 Subject: [PATCH 03/15] modified about page to use parser script --- next.config.js | 3 --- pages/about.js | 8 +++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/next.config.js b/next.config.js index 29fa2c53..609e627d 100644 --- a/next.config.js +++ b/next.config.js @@ -16,10 +16,7 @@ module.exports = { 'photos.google.com', 'photos.app.goo.gl', 't4.ftcdn.net', - 'ca.slack-edge.com', 'www.acmcyber.com', - 'www.bliu.tech', - 'r2dev2.github.io', 'media.licdn.com', 'github.com', ], diff --git a/pages/about.js b/pages/about.js index 2ae8501c..41ae4817 100644 --- a/pages/about.js +++ b/pages/about.js @@ -14,21 +14,19 @@ import boardcollage from '../public/images/boardcollage.png'; import acmHowToJoin from '../public/images/how-to-join.png'; import initiative from '../public/images/initiative.png'; import styles from '../styles/pages/About.module.scss'; + import data from '../scripts/offoutput.json'; function extractContent(officerContent) { - const includedOfficers = ['Nyla Zia', 'Meryl Mathew', 'Larry Zhi', 'Jenna Wang', 'Shiyu Ye', 'Gregor MacDonald', 'Maxine Wu', 'Nemi Desai', - 'Sananshi Pidyar', 'William Zhao', 'Joanna Liu', 'Aaron Kwan', 'Jason An', 'Savannah Alanis', 'Leroy Betterton Gage', - 'Vera Peker', 'Natalie Lord', 'Tiffany Zheng', 'Edward Ng']; const convertedData = officerContent.map(officer => ({ name: officer.name, pronouns: officer.pronouns, - position: officer.role, + 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 => includedOfficers.includes(officer.name)); + })).filter(officer => officer.position.includes('President')); return convertedData; } From 5edbbd1a10e3d3823043aac56393da8befa73fa4 Mon Sep 17 00:00:00 2001 From: Pranav Puranam Date: Wed, 29 May 2024 16:24:13 -0700 Subject: [PATCH 04/15] modify import path --- pages/about.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/about.js b/pages/about.js index 41ae4817..7c8b9ee8 100644 --- a/pages/about.js +++ b/pages/about.js @@ -8,6 +8,7 @@ import Layout from '../components/Layout'; import Officers from '../components/OfficerCard'; // import Officers from '../components/Officers/OfficerCard'; import SocialMedia from '../components/SocialMedia'; +import data from '../offoutput.json'; import acmCommittees from '../public/images/acm_committees.png'; import boardcollage from '../public/images/boardcollage.png'; @@ -15,7 +16,6 @@ import acmHowToJoin from '../public/images/how-to-join.png'; import initiative from '../public/images/initiative.png'; import styles from '../styles/pages/About.module.scss'; -import data from '../scripts/offoutput.json'; function extractContent(officerContent) { const convertedData = officerContent.map(officer => ({ From f901aa25d145199e7a7812aedd0c57a2812b7876 Mon Sep 17 00:00:00 2001 From: Pranav Puranam Date: Wed, 29 May 2024 16:26:36 -0700 Subject: [PATCH 05/15] modify data import path --- pages/about.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/about.js b/pages/about.js index 7c8b9ee8..72471dd6 100644 --- a/pages/about.js +++ b/pages/about.js @@ -8,8 +8,8 @@ import Layout from '../components/Layout'; import Officers from '../components/OfficerCard'; // import Officers from '../components/Officers/OfficerCard'; import SocialMedia from '../components/SocialMedia'; -import data from '../offoutput.json'; +import data from '../offoutput.json'; import acmCommittees from '../public/images/acm_committees.png'; import boardcollage from '../public/images/boardcollage.png'; import acmHowToJoin from '../public/images/how-to-join.png'; From f95981ad2a3a0c0666e76f6b41ae3b33311a721e Mon Sep 17 00:00:00 2001 From: Pranav Puranam Date: Wed, 29 May 2024 16:28:11 -0700 Subject: [PATCH 06/15] modify import path --- pages/about.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/about.js b/pages/about.js index 72471dd6..7c8b9ee8 100644 --- a/pages/about.js +++ b/pages/about.js @@ -8,8 +8,8 @@ import Layout from '../components/Layout'; import Officers from '../components/OfficerCard'; // import Officers from '../components/Officers/OfficerCard'; import SocialMedia from '../components/SocialMedia'; - import data from '../offoutput.json'; + import acmCommittees from '../public/images/acm_committees.png'; import boardcollage from '../public/images/boardcollage.png'; import acmHowToJoin from '../public/images/how-to-join.png'; From b91bf96ccb60cd643180f38df285e63cdcabaad9 Mon Sep 17 00:00:00 2001 From: Pranav Puranam Date: Wed, 29 May 2024 19:22:13 -0700 Subject: [PATCH 07/15] better variable name --- pages/about.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/about.js b/pages/about.js index 7c8b9ee8..ed11fda0 100644 --- a/pages/about.js +++ b/pages/about.js @@ -31,7 +31,7 @@ function extractContent(officerContent) { } function About() { - const convD = extractContent(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.

- +
From 1b94c547dfdc4d8cc064767c7993c9ec3f0e8a20 Mon Sep 17 00:00:00 2001 From: Kevin-D23 <116064184+Kevin-D23@users.noreply.github.com> Date: Tue, 4 Feb 2025 21:01:32 -0800 Subject: [PATCH 08/15] fix: changed attribute names on about page to fit props --- next.config.js | 1 + pages/about.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/next.config.js b/next.config.js index b7168577..9d1cb192 100644 --- a/next.config.js +++ b/next.config.js @@ -21,6 +21,7 @@ module.exports = { 'github.com', 'www.uclaacm.com', 'raw.githubusercontent.com', + 't4.ftcdn.net' ], }, target: 'serverless', diff --git a/pages/about.js b/pages/about.js index ed11fda0..77f019ca 100644 --- a/pages/about.js +++ b/pages/about.js @@ -21,12 +21,12 @@ 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), + role: (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')); + photo: officer.photo, + })).filter(officer => officer.role.includes('President')); return convertedData; } From 4ef03cc10fc1d2522080bbb08325833e423bbbc7 Mon Sep 17 00:00:00 2001 From: Kevin-D23 <116064184+Kevin-D23@users.noreply.github.com> Date: Wed, 5 Feb 2025 08:57:53 -0800 Subject: [PATCH 09/15] feat: about page generates officers using officer-parser script --- pages/about.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/about.js b/pages/about.js index 77f019ca..c17bcc10 100644 --- a/pages/about.js +++ b/pages/about.js @@ -21,7 +21,7 @@ function extractContent(officerContent) { const convertedData = officerContent.map(officer => ({ name: officer.name, pronouns: officer.pronouns, - role: (officer.role === officer.committee ? officer.role : officer.role + ', ' + officer.committee), + role: (officer.committee.includes('Board') ? officer.role : officer.role + ', ' + officer.committee), committee: officer.committee, major: officer.major, year: officer.year, From f1eae129ec610c4bb816651c0f1cb39feb704192 Mon Sep 17 00:00:00 2001 From: Kevin Duong <116064184+Kevin-D23@users.noreply.github.com> Date: Wed, 5 Feb 2025 09:20:25 -0800 Subject: [PATCH 10/15] fix: resolved merging issues --- pages/about.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/about.js b/pages/about.js index d889bb01..54a5da9c 100644 --- a/pages/about.js +++ b/pages/about.js @@ -214,7 +214,7 @@ function About() { growth of their committee.

- +
From 04cff175a19f236d1238bd7282c4b209d29d2abd Mon Sep 17 00:00:00 2001 From: Kevin-D23 <116064184+Kevin-D23@users.noreply.github.com> Date: Wed, 5 Feb 2025 09:22:33 -0800 Subject: [PATCH 11/15] fix: linting issues --- next.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/next.config.js b/next.config.js index 9d1cb192..f5b0f2c7 100644 --- a/next.config.js +++ b/next.config.js @@ -21,7 +21,7 @@ module.exports = { 'github.com', 'www.uclaacm.com', 'raw.githubusercontent.com', - 't4.ftcdn.net' + 't4.ftcdn.net', ], }, target: 'serverless', From 96a168a87a89dde8568e99d0d5919fb8ebaa8aa8 Mon Sep 17 00:00:00 2001 From: Kevin-D23 <116064184+Kevin-D23@users.noreply.github.com> Date: Wed, 5 Feb 2025 15:10:55 -0800 Subject: [PATCH 12/15] update: changed default images on about page to show ACM logo --- pages/about.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pages/about.js b/pages/about.js index 54a5da9c..345adf85 100644 --- a/pages/about.js +++ b/pages/about.js @@ -25,7 +25,10 @@ function extractContent(officerContent) { committee: officer.committee, major: officer.major, year: officer.year, - photo: officer.photo, + photo: (officer.photo != 'https://t4.ftcdn.net/jpg/02/15/84/43/360_F_215844325_ttX9YiIIyeaR7Ne6EaLLjMAmy4GvPC69.jpg' + ? officer.photo + : '/images/officers/acmlogocopy.jpg' + ), // if photo is default, display ACM logo })).filter(officer => officer.role.includes('President')); return convertedData; } From 319f93b1385d05d809358d6219f0dcf85330e185 Mon Sep 17 00:00:00 2001 From: Kevin-D23 <116064184+Kevin-D23@users.noreply.github.com> Date: Wed, 5 Feb 2025 15:24:54 -0800 Subject: [PATCH 13/15] fix: resolved photo distortion on about page --- styles/components/OfficerCard.module.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/components/OfficerCard.module.scss b/styles/components/OfficerCard.module.scss index 48699c34..ad7d5607 100644 --- a/styles/components/OfficerCard.module.scss +++ b/styles/components/OfficerCard.module.scss @@ -84,6 +84,7 @@ height: 70px; margin: 25px 10px 0; width: 70px; + object-fit: cover; } .officer-info { From 65cafc46c3f3d275ea75c1292fea89c5f7774327 Mon Sep 17 00:00:00 2001 From: Kevin-D23 <116064184+Kevin-D23@users.noreply.github.com> Date: Wed, 5 Feb 2025 15:27:28 -0800 Subject: [PATCH 14/15] fix: linting issues --- pages/about.js | 5 +---- styles/components/OfficerCard.module.scss | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pages/about.js b/pages/about.js index 345adf85..76b9b23f 100644 --- a/pages/about.js +++ b/pages/about.js @@ -25,10 +25,7 @@ function extractContent(officerContent) { committee: officer.committee, major: officer.major, year: officer.year, - photo: (officer.photo != 'https://t4.ftcdn.net/jpg/02/15/84/43/360_F_215844325_ttX9YiIIyeaR7Ne6EaLLjMAmy4GvPC69.jpg' - ? officer.photo - : '/images/officers/acmlogocopy.jpg' - ), // if photo is default, display ACM logo + photo: (officer.photo != 'https://t4.ftcdn.net/jpg/02/15/84/43/360_F_215844325_ttX9YiIIyeaR7Ne6EaLLjMAmy4GvPC69.jpg' ? officer.photo : '/images/officers/acmlogocopy.jpg'), // if photo is default, display ACM logo })).filter(officer => officer.role.includes('President')); return convertedData; } diff --git a/styles/components/OfficerCard.module.scss b/styles/components/OfficerCard.module.scss index ad7d5607..e75eeda8 100644 --- a/styles/components/OfficerCard.module.scss +++ b/styles/components/OfficerCard.module.scss @@ -83,8 +83,8 @@ display: inline-block; height: 70px; margin: 25px 10px 0; - width: 70px; object-fit: cover; + width: 70px; } .officer-info { From ac3364c492014c3a39a5d1936563e567c6ce27c4 Mon Sep 17 00:00:00 2001 From: Kevin-D23 <116064184+Kevin-D23@users.noreply.github.com> Date: Wed, 5 Feb 2025 20:36:59 -0800 Subject: [PATCH 15/15] fix: removed redundant code --- next.config.js | 1 - pages/about.js | 1 - 2 files changed, 2 deletions(-) diff --git a/next.config.js b/next.config.js index f5b0f2c7..b7168577 100644 --- a/next.config.js +++ b/next.config.js @@ -21,7 +21,6 @@ module.exports = { 'github.com', 'www.uclaacm.com', 'raw.githubusercontent.com', - 't4.ftcdn.net', ], }, target: 'serverless', diff --git a/pages/about.js b/pages/about.js index 76b9b23f..42f8cd31 100644 --- a/pages/about.js +++ b/pages/about.js @@ -6,7 +6,6 @@ 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 '../offoutput.json';