diff --git a/components/Officers/OfficerCard.js b/components/Officers/OfficerCard.js
index e9601c03..21fb3f7c 100644
--- a/components/Officers/OfficerCard.js
+++ b/components/Officers/OfficerCard.js
@@ -1,10 +1,14 @@
// import { faEnvelope } from '@fortawesome/free-regular-svg-icons';
// import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import Image from 'next/legacy/image';
+import { useState } from 'react';
import styles from '../../styles/components/Officers/OfficerCard.module.scss';
import '@fortawesome/fontawesome-svg-core/styles.css';
+const DEFAULT_PHOTO =
+ 'https://t4.ftcdn.net/jpg/02/15/84/43/360_F_215844325_ttX9YiIIyeaR7Ne6EaLLjMAmy4GvPC69.jpg';
+
function Officer({
name,
position,
@@ -16,6 +20,10 @@ function Officer({
/* eslint-disable-next-line no-unused-vars */
committee, // no officer card formats use committee yet
}) {
+ // Fall back to the default photo if the image fails to load
+ // (e.g. a Google Drive file that isn't shared publicly)
+ const [failedImg, setFailedImg] = useState(null);
+ const photo = img && img !== failedImg ? img : DEFAULT_PHOTO;
if (size && size.toLowerCase() === 'compact') {
return (
setFailedImg(img)}
/>
diff --git a/public/images/gm/Fall_GM_2026_graphic.png b/public/images/gm/Fall_GM_2026_graphic.png
index 7a42929c..57ca22c7 100644
Binary files a/public/images/gm/Fall_GM_2026_graphic.png and b/public/images/gm/Fall_GM_2026_graphic.png differ
diff --git a/scripts/officer-parser.mjs b/scripts/officer-parser.mjs
index c9425303..6a786fc8 100644
--- a/scripts/officer-parser.mjs
+++ b/scripts/officer-parser.mjs
@@ -50,7 +50,7 @@ async function main() {
// Example: if latest archived is Officers(25-26), then Officers sheet = 26-27
const currentFullYear = `20${latestYear}-20${latestYear + 1}`;
alumYears.push(currentFullYear);
- const currentData = await getGoogleSheetData(auth, `Officers!A3:K`);
+ const currentData = await getGoogleSheetData(auth, `Officers!A3:M`, true);
allData[currentFullYear] = currentData;
// Also write current officers to officeroutput.json for backwards compatibility
@@ -83,7 +83,7 @@ async function authorizeGoogleAPI() {
// Read data from Google sheets
// using sheet range (eg: 'Week 1!A:H)
-async function getGoogleSheetData(auth, range) {
+async function getGoogleSheetData(auth, range, isCurrent = false) {
const committees = [
'Board',
'Board, Dev Team',
@@ -114,6 +114,8 @@ async function getGoogleSheetData(auth, range) {
const rows = res?.data.values;
for (let i = 0; i < rows.length; i++) {
const row = rows[i];
+ // Current sheet has extra Transfer?/Grad? columns (G, H); drop them
+ if (isCurrent) row.splice(6, 2);
if (committees.includes(row[0])) {
currCommittee = row[0];
} else if (row[1]) {
@@ -143,6 +145,7 @@ async function getGoogleSheetData(auth, range) {
}
} catch (err) {
console.log(err);
+ image = 'https://t4.ftcdn.net/jpg/02/15/84/43/360_F_215844325_ttX9YiIIyeaR7Ne6EaLLjMAmy4GvPC69.jpg';
}
}
row[11] = currCommittee;