Merge branch 'master' into prod

Author: Brodypen

src/assets/officers/spring2024/Adrian-Armenta.png

@@ -67,6 +67,242 @@ import Wahab2 from '../assets/officers/fall2023/wahab-javed.webp';
 import Grace from '../assets/officers/fall2023/grace-rabano.webp';
 import Jorell2 from '../assets/officers/fall2023/jorell-padilla.webp';
 
+import AdrainArmentaSpring2024 from '../assets/officers/spring2024/Adrian-Armenta.png';
+import AltonPhanSpring2024 from '../assets/officers/spring2024/Alton-Phan.png';
+import AlvaroUrtazaSpring2024 from '../assets/officers/spring2024/Alvaro-Urtaza.png';
+import BrodyPenSpring2024 from '../assets/officers/spring2024/Brody-Pen.png';
+import DianteJacksonSpring2024 from '../assets/officers/spring2024/Diante-Jackson.png';
+import FelipeFloresSpring2024 from '../assets/officers/spring2024/Felipe-Flores.png';
+import HersonCruzSpring2024 from '../assets/officers/spring2024/Hersh-Cruz.jpg';
+import HitarthThankiSpring2024 from '../assets/officers/spring2024/Hitarth-Thanki.png';
+import IsaiasGonzalesSpring2024 from '../assets/officers/spring2024/Isaias-Gonzalez.png';
+
+import JenniferCejaSpring2024 from '../assets/officers/spring2024/Jennifer-Ceja.png';
+// import JenniferFigueroaSpring2024 from '../assets/officers/spring2024/Jennifer-Figueroa.png'; // ! MISSING PICTURE
+import JenniferFigueroaSpring2024 from '../assets/officers/fall2023/jennifer-figueroa.webp';
+import JesterSantosSpring2024 from '../assets/officers/spring2024/Jester-Santos.png';
+import JohnCoxSpring2024 from '../assets/officers/spring2024/John-Cox.png';
+import LenaPhamSpring2024 from '../assets/officers/spring2024/Lena-Pham.png';
+import MaximillianChalitsiosSpring2024 from '../assets/officers/spring2024/Maximillian-Chalitsios.png';
+import MichelleNguyenSpring2024 from '../assets/officers/spring2024/Michelle-Nguyen.png';
+import SnehaJacobSpring2024 from '../assets/officers/spring2024/Sneha-Jacob.png';
+import TariqZyadSpring2024 from '../assets/officers/spring2024/Tariq-Zyad.png';
+import VaishnaviRaoSpring2024 from '../assets/officers/spring2024/Vaishnavi-Rao.png';
+import ZahraBukhariSpring2024 from '../assets/officers/spring2024/Zahra-Bukhari.png';
+
+export const officersSpring2024 = [
+	{
+		id: 0,
+		name: 'Dr.Chang Yun',
+		image: Dr_Yun,
+		linkedin: 'https://www.linkedin.com/in/chang-yun-94340a14/',
+		email: '[email protected]',
+		title: 'Faculty Advisor',
+		open: false,
+		show: false,
+	},
+	{
+		id: 1,
+		name: 'John Cox',
+		image: JohnCoxSpring2024,
+		linkedin: 'https://www.linkedin.com/in/johncoxdev/',
+		email: '[email protected]',
+		title: 'President',
+		open: false,
+		show: true,
+	},
+	{
+		id: 2,
+		name: 'Maximillian Chalitsios',
+		image: MaximillianChalitsiosSpring2024,
+		linkedin: 'https://www.linkedin.com/in/maximillianchalitsios/',
+		email: '[email protected]',
+		title: 'Vice President',
+		open: false,
+		show: true,
+	},
+	{
+		id: 3,
+		name: 'Felipe Flores',
+		image: FelipeFloresSpring2024,
+		linkedin: 'https://www.linkedin.com/in/faflore5/',
+		email: '[email protected]',
+		title: 'Vice President - Finances',
+		open: false,
+		show: true,
+	},
+	{
+		id: 4,
+		name: 'Michelle Nguyen',
+		image: MichelleNguyenSpring2024,
+		linkedin: 'https://www.linkedin.com/in/mnguyener2003/',
+		email: '[email protected]',
+		title: 'Vice President - Adminitration',
+		open: false,
+		show: true,
+	},
+	{
+		id: 5,
+		name: 'Hitarth Thanki',
+		image: HitarthThankiSpring2024,
+		linkedin: 'https://www.linkedin.com/in/hitarth-thanki/',
+		email: '[email protected]',
+		title: 'Director of CodeRED',
+		open: false,
+		show: true,
+	},
+	{
+		id: 6,
+		name: 'Adrian Armenta',
+		image: AdrainArmentaSpring2024,
+		linkedin: 'https://www.linkedin.com/in/adrian-armenta-92029b28b/',
+		email: '[email protected]',
+		title: 'Vice President - Marketing',
+		open: false,
+		show: true,
+	},
+	{
+		id: 7,
+		name: 'Vaishnavi Rao',
+		image: VaishnaviRaoSpring2024,
+		linkedin: 'https://www.linkedin.com/in/vaishnavi-rao-r23/',
+		email: '[email protected]',
+		title: 'Designer',
+		open: false,
+		show: true,
+	},
+	{
+		id: 8,
+		name: 'Jennifer Ceja',
+		image: JenniferCejaSpring2024,
+		linkedin: 'https://www.linkedin.com/in/jennifer-ceja-1508212b2/',
+		email: '[email protected]',
+		title: 'Designer',
+		open: false,
+		show: true,
+	},
+	{
+		id: 9,
+		name: 'Isaias Gonzales',
+		image: IsaiasGonzalesSpring2024,
+		linkedin: 'https://www.linkedin.com/in/is4as/',
+		email: '[email protected]',
+		title: 'Designer',
+		open: false,
+		show: true,
+	},
+	{
+		id: 10,
+		name: 'Lena Pham',
+		image: LenaPhamSpring2024,
+		linkedin: 'https://www.linkedin.com/in/lena-pham47/',
+		email: '[email protected]',
+		title: 'Historian',
+		open: false,
+		show: true,
+	},
+	{
+		id: 11,
+		name: 'Sneha Jacob',
+		image: SnehaJacobSpring2024,
+		linkedin: 'https://www.linkedin.com/in/snehajac/',
+		email: '[email protected]',
+		title: 'Historian',
+		open: false,
+		show: true,
+	},
+	{
+		id: 12,
+		name: 'Zahra Bukhari',
+		image: ZahraBukhariSpring2024,
+		linkedin: 'https://www.linkedin.com/in/zahra-bukhari/',
+		email: '[email protected]',
+		title: 'Corporate Relations',
+		open: false,
+		show: true,
+	},
+	{
+		id: 13,
+		name: 'Jester Sebastian Santos',
+		image: JesterSantosSpring2024,
+		linkedin: 'https://www.linkedin.com/in/jsantos738/',
+		email: '[email protected]',
+		title: 'Events Chair',
+		open: false,
+		show: true,
+	},
+	{
+		id: 14,
+		name: 'Alvaro Urtaza',
+		image: AlvaroUrtazaSpring2024,
+		linkedin: 'https://www.linkedin.com/in/alvaro-urtaza/',
+		email: '[email protected]',
+		title: 'Events Chair',
+		open: false,
+		show: true,
+	},
+	{
+		id: 15,
+		name: 'Alton Phan',
+		image: AltonPhanSpring2024,
+		linkedin: 'https://www.linkedin.com/in/altonphan/',
+		email: '[email protected]',
+		title: 'Operations Director',
+		open: false,
+		show: true,
+	},
+	{
+		id: 16,
+		name: 'Jennifer Figueroa',
+		image: JenniferFigueroaSpring2024,
+		linkedin: 'https://www.linkedin.com/in/jennifer-figueroa-maria/',
+		email: '[email protected]',
+		title: 'Operations Team Member',
+		open: false,
+		show: true,
+	},
+	{
+		id: 17,
+		name: 'Herson Mercado Cruz',
+		image: HersonCruzSpring2024,
+		linkedin: 'https://www.linkedin.com/in/hamercadocruz/',
+		email: '[email protected]',
+		title: 'Operations Team Member',
+		open: false,
+		show: true,
+	},
+	{
+		id: 18,
+		name: 'Tariq Achor Zyad',
+		image: TariqZyadSpring2024,
+		linkedin: 'https://www.linkedin.com/in/tachorzy',
+		email: '[email protected]',
+		title: 'Tutoring Director',
+		open: false,
+		show: true,
+	},
+	{
+		id: 19,
+		name: 'Brody Pen',
+		image: BrodyPenSpring2024,
+		linkedin: 'https://www.linkedin.com/in/brodypen',
+		email: '[email protected]',
+		title: 'Web Master',
+		open: false,
+		show: true,
+	},
+	{
+		id: 20,
+		name: 'Diante Jackson',
+		image: DianteJacksonSpring2024,
+		linkedin: 'https://www.linkedin.com/in/diantej/',
+		email: '[email protected]',
+		title: 'Information Security Director',
+		open: false,
+		show: true,
+	},
+];
+
 export const officersFall2023 = [
 	{
 		id: 0,

src/assets/officers/spring2024/Alton-Phan.png

@@ -1,7 +1,7 @@
 import React, { lazy, Suspense } from 'react';
 import { Col, Container, Row } from 'react-bootstrap';
 import aboutpic from '../../assets/gallery/aboutuspic.svg';
-import { officersFall2023 } from '../../data/officers';
+import { officersSpring2024 } from '../../data/officers';
 import cougarettesLogo from '../../assets/partner-logos/cougarettes.webp';
 import csgirlsLogo from '../../assets/partner-logos/csgirls.webp';
 import codeCoogsLogo from '../../assets/partner-logos/codeCoogs.webp';
@@ -20,7 +20,8 @@ const meta = {
 };
 
 const About = () => {
-	const officers = officersFall2023;
+	const officers = officersSpring2024;
+	console.log(officers);
 
 	return (
 		<>