Summer2022 updates

.gitignore

@@ -104,3 +104,6 @@ dist
 
 # TernJS port file
 .tern-port
+
+# yarn.lock created when running yarn
+.yarn.lock

src/pages/decal/index.js

@@ -1,22 +1,22 @@
 import React from 'react';
 
-import Leadership from '../team/members/data/leadership';
+import Leadership from '../team/members/data/exec';
 import CourseStaff from '../team/members/data/coursestaff';
 import Profile from '../../components/profile';
 import Header from '../../components/header';
 
-import Timeline from './constants/Timeline.js';
+// import Timeline from './constants/Timeline.js';
 
 import Container from 'react-bootstrap/Container';
 import Row from 'react-bootstrap/Row';
 
-import Carousel, {
-	slidesToShowPlugin,
-	arrowsPlugin,
-} from '@brainhubeu/react-carousel';
+// import Carousel, {
+// 	slidesToShowPlugin,
+// 	arrowsPlugin,
+// } from '@brainhubeu/react-carousel';
 import '@brainhubeu/react-carousel/lib/style.css';
-import left from './img/leftarrow.png';
-import right from './img/rightarrow.png';
+// import left from './img/leftarrow.png';
+// import right from './img/rightarrow.png';
 
 import Calender from './img/calender.png';
 import Clock from './img/clock.png';

src/pages/join/index.js

@@ -1,24 +1,24 @@
 import React from 'react';
 
-import testimonials from './constants/Testimonials';
-import recruitment from './constants/Recruitment';
+// import testimonials from './constants/Testimonials';
+// import recruitment from './constants/Recruitment';
 import Header from '../../components/header';
 import Button from '../../components/button';
 
-import { Link } from 'react-router-dom';
+// import { Link } from 'react-router-dom';
 
 import Container from 'react-bootstrap/Container';
 import Row from 'react-bootstrap/Row';
 
 import Fade from 'react-reveal/Fade';
 
-import Bg from './img/bg.png';
-import Blobs from './img/blobs.png';
+// import Bg from './img/bg.png';
+// import Blobs from './img/blobs.png';
 import Blobs2 from './img/blobs2.png';
 import Blobs3 from './img/blobs3.png';
-import tony from '../team/members/data/leadership/img/tony.png';
+import tony from '../team/members/data/product/img/tony.png';
 import aadhiti from '../team/members/data/developers/img/aadhiti.png';
-import danielle from '../team/members/data/designers/img/danielle.png';
+import danielle from '../team/members/data/exec/img/danielle.png';
 
 import styles from './style.module.scss';
 

src/pages/team/alumni/data/advisors/index.js

@@ -1,30 +1,31 @@
 import Vicky from './img/vicky.png';
 import Samarth from './img/samarth.png';
-import Alex from './img/alex.png';
 import Aditya from './img/aditya.png';
 import Lizzie from './img/lizzie.png';
 import Jasmine from './img/jasmine.png';
 import Tijmen from './img/tijmen.png';
-import Izzie from './img/izzie.png';
 import Hector from './img/hector.png';
 import Abhi from './img/abhi.png';
 import Arushi from './img/arushi.png';
 import Albert from './img/albert.png';
 import Andy from './img/andy.png';
-import Neha from './img/neha.png';
-import Emily from './img/emily-1.png';
+import EmilyWu from './img/emily_wu.png';
 import Ethan from './img/ethan.png';
-import James from './img/james.png';
 import Henry from './img/henry.png';
 import Nerissa from './img/nerissa.png';
 import Sooyeon from './img/sooyeon.png';
-import EmilyWu from './img/emily.png';
 import Noor from './img/noor.png';
-import Atharva from './img/atharva.png';
 import Caelin from './img/caelin.png';
-import Stephen from './img/stephen.png';
+import Alexis from './img/alexis.png';
+import Justin from './img/justin.png';
+import Rick from './img/rick.png';
+import Youngjun from './img/youngjun.png';
+import Laura from './img/laura.png';
+import Neil from './img/neil.png';
+import Daniel from './img/daniel.png';
+import EmilySu from './img/emily_su.png';
 
-const data = [
+const data = [	
 	{
 		name: 'Samarth Goel',
 		image: Samarth,
@@ -51,13 +52,13 @@ const data = [
 		semester: 0
 	},
 	{
-		name: 'Alex Wu',
-		image: Alex,
-		role: 'Education VP',
-		linkedin: 'https://www.linkedin.com/in/jialin-wu-658929185/',
-		personal:
-			'https://jialin-wu.com/Hi-I-am-Alex-Wu-e214ae8665244ef8b086d669f2d21800',
-		semester: 0
+		name: 'Justin Chen',
+		image: Justin,
+		role: 'Co-External VP and Co-Founder',
+		linkedin: 'https://www.linkedin.com/in/justinshawnchen/',
+		personal: 'https://www.itsjustchen.com',
+		applemusic: 'https://music.apple.com/profile/jch3nx',
+		email: 'mailto: [email protected]',
 	},
 	{
 		name: 'Caelin Sutch',
@@ -92,14 +93,6 @@ const data = [
 		personal: 'https://github.com/tijmensep',
 		semester: 0
 	},
-	{
-		name: 'Izzie Lau',
-		image: Izzie,
-		role: 'Head of Marketing',
-		linkedin: 'https://www.linkedin.com/in/izzielau/',
-		personal: 'https://izzielau.github.io/',
-		semester: 1
-	},
 	{
 		name: 'Arushi Somani',
 		image: Arushi,
@@ -130,13 +123,6 @@ const data = [
 		personal: 'https://github.com/albTian',
 		semester: 1
 	},
-	{
-		name: 'Atharva Mehendale',
-		image: Atharva,
-		role: 'Product Manager',
-		linkedin: 'https://www.linkedin.com/in/atharvamehendale/',
-		semester: 1
-	},
 
 	{
 		name: 'Noor Mahani',
@@ -154,23 +140,6 @@ const data = [
 		personal: 'http://github.com/andybojiang',
 		semester: 1
 	},
-
-	{
-		name: 'Neha Haq',
-		image: Neha,
-		role: 'Product Manager',
-		linkedin: 'https://www.linkedin.com/in/neha-haq/',
-		personal: 'https://github.com/nwhaq1',
-		semester: 0
-	},
-	{
-		name: 'Emily Su',
-		image: Emily,
-		role: 'Product Manager',
-		linkedin: 'https://www.linkedin.com/in/emily-su/',
-		personal: 'https://github.com/emilysu01',
-		semester: 0
-	},
 	{
 		name: 'Ethan Wu',
 		image: Ethan,
@@ -186,13 +155,7 @@ const data = [
 	// 	linkedin: 'https://www.linkedin.com/in/skrider/',
 	// 	semester: 1
 	// },
-	{
-		name: 'James Shin',
-		image: James,
-		role: 'Developer',
-		linkedin: 'https://www.linkedin.com/in/jamesjungmin',
-		semester: 0
-	},
+
 	{
 		name: 'Henry Chiu',
 		image: Henry,
@@ -224,6 +187,56 @@ const data = [
 		personal: 'https://github.com/emilyjw98',
 		semester: 1
 	},
+	{
+		name: 'Alexis Kim',
+		image: Alexis,
+		role: 'Design VP',
+		linkedin: 'https://www.linkedin.com/in/alexis-kim-1348841b6',
+		personal:
+			'https://alexiskimdesign.notion.site/ALEXIS-KIM-9032da2c255d480bbfe37233620be503',
+		email: 'mailto: [email protected]',
+	},
+	{
+		name: 'Rick Zhou',
+		image: Rick,
+		role: 'Member Experience',
+		linkedin: 'https://www.linkedin.com/in/rick-zhou-a35208169//',
+	},
+	{
+		name: 'Youngjun Seo',
+		image: Youngjun,
+		role: 'Member Experience',
+		linkedin: 'https://www.linkedin.com/in/youngjun-seo-9170a91a1/',
+	},
+	{
+		name: 'Laura Pei',
+		image: Laura,
+		role: 'Industry Design Mentor & Marketing',
+		linkedin: 'https://www.linkedin.com/in/laurapei/',
+		personal: 'https://github.com/lauraspberry',
+	},
+	{
+		name: 'Neil Kamdar',
+		image: Neil,
+		role: 'Frontend TA',
+		linkedin: 'https://www.linkedin.com/in/neil-kamdar/',
+		personal: 'github.com/nvk518',
+	},
+	{
+		name: 'Daniel Won',
+		image: Daniel,
+		role: 'Bootcamp Design Counselor & Marketing',
+		linkedin: 'https://www.linkedin.com/in/danielw23/',
+	}, 	
+	{
+		name: 'Emily Su',
+		image: EmilySu,
+		role: 'Product Manager',
+		linkedin: 'https://www.linkedin.com/in/emily-su/',
+		personal: 'https://github.com/emilysu01',
+		semester: 0
+	},
+
 ];
 
 export default data;

src/pages/team/alumni/data/alumni/index.js

@@ -5,8 +5,60 @@ import Jessica from './img/jessica.png';
 import Raga from './img/raga.png';
 import Melody from './img/melody.png';
 import Ervin from './img/ervin.png';
+import Gabe from './img/gabe.png';
+import Alex from './img/alex.png';
+import Atharva from './img/atharva.png';
+import James from './img/james.png';
+
+import Neha from './img/neha.png'
+import Izzie from './img/izzie.png';
 
 const data = [
+	// Spring 2022
+	{
+		name: 'Gabriel Meng',
+		image: Gabe,
+		role: 'Member Experience',
+		linkedin: 'https://www.linkedin.com/in/gabrielmeng/',
+	},
+	{
+		name: 'Alex Wu',
+		image: Alex,
+		role: 'Full Stack TA',
+		linkedin: 'https://www.linkedin.com/in/jialin-wu-658929185/',
+		personal:
+			'https://jialin-wu.com/Hi-I-am-Alex-Wu-e214ae8665244ef8b086d669f2d21800',
+	},
+	{
+		name: 'Atharva Mehendale',
+		image: Atharva,
+		role: 'Product Manager',
+		linkedin: 'https://www.linkedin.com/in/atharvamehendale/',
+		semester: 1
+	},
+	{
+		name: 'James Shin',
+		image: James,
+		role: 'Developer',
+		linkedin: 'https://www.linkedin.com/in/jamesjungmin',
+		semester: 0
+	},
+	{
+		name: 'Neha Haq',
+		image: Neha,
+		role: 'Product Manager',
+		linkedin: 'https://www.linkedin.com/in/neha-haq/',
+		personal: 'https://github.com/nwhaq1',
+		semester: 0
+	},
+	{
+		name: 'Izzie Lau',
+		image: Izzie,
+		role: 'Head of Marketing',
+		linkedin: 'https://www.linkedin.com/in/izzielau/',
+		personal: 'https://izzielau.github.io/',
+		semester: 1
+	},
 	// Fall 2021
 	{
 		name: 'Ani Vangala',

src/pages/team/members/data/counselors/index.js

@@ -0,0 +1,44 @@
+import Rex from './img/rex.png';
+import Meiqi from './img/meiqi.png';
+import Nitya from './img/nitya.png';
+import Rohan_Taneja from './img/rohan_taneja.png';
+import Jessica from './img/jessica.png';
+
+const data = [
+	{
+		name: 'Rex Liu',
+		image: Rex,
+		role: 'Frontend Counselor',
+		linkedin: 'https://linkedIn.com/in/rexliu3',
+		personal: 'https://www.rexliu.dev',
+		spotify: 'https://open.spotify.com/user/rexliu3?si=35272561ae24429b',
+	},
+	{
+		name: 'Meiqi Liang',
+		image: Meiqi,
+		role: 'Design Counselor',
+		linkedin: 'https://www.linkedin.com/in/meiqi-liang/',
+	},
+	{
+		name: 'Jessica Hwang',
+		image: Jessica,
+		role: 'Product Designer',
+		personal: 'https://www.github.com/jyjhwang',
+	},
+	{
+		name: 'Rohan Taneja',
+		image: Rohan_Taneja,
+		role: 'Frontend Counselor',
+		linkedin: 'https://www.linkedin.com/in/rohan-taneja/',
+		personal: 'https://www.rtaneja.com',
+	},
+	{
+		name: 'Nitya Krishnakumar',
+		image: Nitya,
+		role: 'Frontend Counselor',
+		linkedin: 'https://www.linkedin.com/in/nitya-krish/',
+		personal: 'https://github.com/nitya-krish',
+	},
+];
+
+export default data;