Date: Wed, 2 Oct 2024 17:49:10 -0700
Subject: [PATCH 4/7] adding minor option
---
frontend/src/components/MemberProfile/MemberProfile.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/components/MemberProfile/MemberProfile.tsx b/frontend/src/components/MemberProfile/MemberProfile.tsx
index c3b002e3..534bc693 100644
--- a/frontend/src/components/MemberProfile/MemberProfile.tsx
+++ b/frontend/src/components/MemberProfile/MemberProfile.tsx
@@ -183,7 +183,7 @@ const MemberProfile = (userData: MemberProfileProps) => {
Major:
{userData.memberMajor}
- {((typeof userData.memberMinor !== 'undefined')) &&
+ {((typeof userData.memberMinor !== 'undefined' && userData.memberMinor !== '')) &&
Date: Wed, 2 Oct 2024 17:55:03 -0700
Subject: [PATCH 5/7] got rid of some warnings
---
frontend/src/components/About/About.tsx | 21 +++++-----
frontend/src/components/About/HowToJoin.tsx | 40 ++++++++++---------
.../src/components/About/OurCommunities.tsx | 16 ++++----
3 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/frontend/src/components/About/About.tsx b/frontend/src/components/About/About.tsx
index ec44c932..b03d6db6 100644
--- a/frontend/src/components/About/About.tsx
+++ b/frontend/src/components/About/About.tsx
@@ -1,6 +1,4 @@
import React, { useEffect, useRef, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
-import Button from '../Button/Button';
import { Container, Box, Grid, createTheme, useMediaQuery } from '@mui/material';
import bgTop from '../../images/shape2.svg';
import bgBtm from '../../images/shape2.svg';
@@ -11,7 +9,6 @@ import MeetTheTeam from './MeetTheTeam';
import Communities from './OurCommunities';
import HowtoJoin from './HowToJoin';
import about1 from '../../images/aboutpage/about_1.jpg';
-import about3 from '../../images/aboutpage/about_3.jpg';
import { ImageWithBoxShadow } from '../Opportunities/Opportunities';
import Typewriter from './TypeWriter';
import { motion } from "framer-motion"
@@ -25,6 +22,8 @@ const About = () => {
const ref = useRef(null);
useEffect(() => {
+ const currentRef = ref.current; // Copy ref to a local variable
+
const observer = new IntersectionObserver(
([entry]) => {
if (entry.isIntersecting) {
@@ -36,17 +35,17 @@ const About = () => {
threshold: 0.1, // Adjust this value as needed
}
);
-
- if (ref.current) {
- observer.observe(ref.current);
+
+ if (currentRef) {
+ observer.observe(currentRef);
}
-
+
return () => {
- if (ref.current) {
- observer.unobserve(ref.current);
+ if (currentRef) {
+ observer.unobserve(currentRef); // Use the local variable for cleanup
}
};
- }, []);
+ }, [ref]);
return (
@@ -82,7 +81,7 @@ const About = () => {
CSE Society was the first CSE organization at UCSD starting over twenty years
ago, and we have innovated over the years to stay relevant in serving the CSE
- community. We are open to all majors and indivduals who are interested in
+ community. We are open to all majors and individuals who are interested in
computing!
diff --git a/frontend/src/components/About/HowToJoin.tsx b/frontend/src/components/About/HowToJoin.tsx
index a2869552..d59d1766 100644
--- a/frontend/src/components/About/HowToJoin.tsx
+++ b/frontend/src/components/About/HowToJoin.tsx
@@ -16,28 +16,30 @@ const HowtoJoin = () => {
const ref1 = useRef(null);
useEffect(() => {
- const observer = new IntersectionObserver(
- ([entry]) => {
- if (entry.isIntersecting) {
- setIsInView1(true);
- observer.disconnect(); // Disconnect after first trigger
- }
- },
- {
- threshold: 0.1, // Adjust this value as needed
- }
- );
+ const currentRef = ref1.current; // Copy ref1 to a local variable
- if (ref1.current) {
- observer.observe(ref1.current);
+ const observer = new IntersectionObserver(
+ ([entry]) => {
+ if (entry.isIntersecting) {
+ setIsInView1(true);
+ observer.disconnect(); // Disconnect after first trigger
+ }
+ },
+ {
+ threshold: 0.1, // Adjust this value as needed
}
+ );
- return () => {
- if (ref1.current) {
- observer.unobserve(ref1.current);
- }
- };
- }, []);
+ if (currentRef) {
+ observer.observe(currentRef);
+ }
+
+ return () => {
+ if (currentRef) {
+ observer.unobserve(currentRef); // Use the local variable for cleanup
+ }
+ };
+ }, [ref1]);
return (
{
const ref = useRef(null);
useEffect(() => {
+ const currentRef = ref.current; // Copy ref to a local variable
+
const observer = new IntersectionObserver(
([entry]) => {
if (entry.isIntersecting) {
@@ -33,17 +35,17 @@ const Communities = () => {
threshold: 0.1, // Adjust this value as needed
}
);
-
- if (ref.current) {
- observer.observe(ref.current);
+
+ if (currentRef) {
+ observer.observe(currentRef);
}
-
+
return () => {
- if (ref.current) {
- observer.unobserve(ref.current);
+ if (currentRef) {
+ observer.unobserve(currentRef); // Use the local variable for cleanup
}
};
- }, []);
+ }, [ref]);
return (
From 9c90b02549a590b03a101cd2e5100628a4a46bda Mon Sep 17 00:00:00 2001
From: shreyaNagunuri
Date: Wed, 30 Oct 2024 17:18:02 -0700
Subject: [PATCH 6/7] adding board photos and remove innovate org
---
frontend/src/components/About/MeetTheTeam.tsx | 83 ++++++++----------
.../src/components/About/OurCommunities.tsx | 21 -----
.../images/meettheteamImages/Aditi_Bansal.jpg | Bin 0 -> 1218295 bytes
.../meettheteamImages/Aditya_Kakarla.jpg | Bin 0 -> 184749 bytes
.../meettheteamImages/Aryen_Singhal.jpg | Bin 0 -> 201836 bytes
.../meettheteamImages/Bhavik_Chandna.jpg | Bin 0 -> 57577 bytes
.../meettheteamImages/Chase_Peterson.jpg | Bin 0 -> 675258 bytes
.../meettheteamImages/Hillary_Chang.webp | Bin 0 -> 7652 bytes
.../images/meettheteamImages/Kevin_Sun.jpg | Bin 0 -> 172087 bytes
.../meettheteamImages/Lucas_Hiaing.jpeg | Bin 0 -> 406882 bytes
.../meettheteamImages/Nikitha_Maderamitla.jpg | Bin 0 -> 147008 bytes
.../images/meettheteamImages/Pranav_Soma.jpeg | Bin 0 -> 463144 bytes
.../images/meettheteamImages/Ryan_Das.jpeg | Bin 0 -> 1726219 bytes
.../meettheteamImages/Shree_Venkatesh.jpg | Bin 0 -> 214752 bytes
.../images/meettheteamImages/Steven_Shi.jpg | Bin 0 -> 174761 bytes
.../images/meettheteamImages/Tia_Irani.jpeg | Bin 0 -> 927339 bytes
.../images/meettheteamImages/Varun_Parekh.jpg | Bin 0 -> 6538066 bytes
.../meettheteamImages/Vinod_Vairavaraj.png | Bin 0 -> 343438 bytes
18 files changed, 39 insertions(+), 65 deletions(-)
create mode 100644 frontend/src/images/meettheteamImages/Aditi_Bansal.jpg
create mode 100644 frontend/src/images/meettheteamImages/Aditya_Kakarla.jpg
create mode 100644 frontend/src/images/meettheteamImages/Aryen_Singhal.jpg
create mode 100644 frontend/src/images/meettheteamImages/Bhavik_Chandna.jpg
create mode 100644 frontend/src/images/meettheteamImages/Chase_Peterson.jpg
create mode 100644 frontend/src/images/meettheteamImages/Hillary_Chang.webp
create mode 100644 frontend/src/images/meettheteamImages/Kevin_Sun.jpg
create mode 100644 frontend/src/images/meettheteamImages/Lucas_Hiaing.jpeg
create mode 100644 frontend/src/images/meettheteamImages/Nikitha_Maderamitla.jpg
create mode 100644 frontend/src/images/meettheteamImages/Pranav_Soma.jpeg
create mode 100644 frontend/src/images/meettheteamImages/Ryan_Das.jpeg
create mode 100644 frontend/src/images/meettheteamImages/Shree_Venkatesh.jpg
create mode 100644 frontend/src/images/meettheteamImages/Steven_Shi.jpg
create mode 100644 frontend/src/images/meettheteamImages/Tia_Irani.jpeg
create mode 100644 frontend/src/images/meettheteamImages/Varun_Parekh.jpg
create mode 100644 frontend/src/images/meettheteamImages/Vinod_Vairavaraj.png
diff --git a/frontend/src/components/About/MeetTheTeam.tsx b/frontend/src/components/About/MeetTheTeam.tsx
index 5e321f1b..1436945e 100644
--- a/frontend/src/components/About/MeetTheTeam.tsx
+++ b/frontend/src/components/About/MeetTheTeam.tsx
@@ -5,82 +5,66 @@ import next from '../../images/next.png';
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
import { buttonStyles } from '../Button/styles';
import { aboutStyles } from './styles';
-import Nabil from '../../images/meettheteamImages/nabil.jpg';
-import Samvrit from '../../images/meettheteamImages/samvrit.jpeg';
-import Anuj from '../../images/meettheteamImages/anuj.jpg';
import Sithu from '../../images/meettheteamImages/sithu.jpg';
import Rahul from '../../images/meettheteamImages/rahul.png';
-import Ishika from '../../images/meettheteamImages/ishika.jpg';
import Yashil from '../../images/meettheteamImages/yashil vora.jpg';
-import Cassandra from '../../images/meettheteamImages/cassandra.png';
-import Rachel from '../../images/meettheteamImages/rachel paner.jpeg';
-import Christopher from '../../images/meettheteamImages/christopher.png';
-import Ketan from '../../images/meettheteamImages/ketan.jpg';
-import Gloria from '../../images/meettheteamImages/gloria.jpg';
import Mishka from '../../images/meettheteamImages/mishka.jpeg';
-import Delvin from '../../images/meettheteamImages/delvin.jpg';
-import Joyce from '../../images/meettheteamImages/joyce.jpg';
-import Will from '../../images/meettheteamImages/will.jpg';
import Brian from '../../images/meettheteamImages/brian.jpg';
-import Shruti from '../../images/meettheteamImages/shruti.jpg';
-import Manan from '../../images/meettheteamImages/manan.jpg';
-import Jheel from '../../images/meettheteamImages/jheel.jpg';
-import Sonia from '../../images/meettheteamImages/sonia.jpg';
import Jake from '../../images/meettheteamImages/jake villaseno.jpeg';
import Jose from '../../images/meettheteamImages/josue martinez.jpeg';
import Angelina from '../../images/meettheteamImages/angelina yee.jpg';
-import Shambhavi from '../../images/meettheteamImages/shambhavi mittal.jpg';
import Ganesh from '../../images/meettheteamImages/ganesh kumarappan.jpg';
import Sardor from '../../images/meettheteamImages/sardor sobirov.jpg';
import Shreya from '../../images/meettheteamImages/shreya gupta.jpg';
import ShreyaN from '../../images/meettheteamImages/Shreya Nagunuri.png';
-import Ryan from '../../images/meettheteamImages/ryan rickey.jpg';
-import Viren from '../../images/meettheteamImages/viren nathan.jpg';
import Kevin from '../../images/meettheteamImages/kevin kim.jpeg';
import KevinW from '../../images/meettheteamImages/KevinWu.png';
import Sofia from '../../images/meettheteamImages/sofia nguyen.png';
import Maanasa from '../../images/meettheteamImages/maanasa prasad.png';
-import Ali from '../../images/meettheteamImages/ali alani.png';
import Michael from '../../images/meettheteamImages/michael he.png';
-import Cole from '../../images/meettheteamImages/cole.png';
-import Victor from '../../images/meettheteamImages/VictorKim.jpeg';
+import Pranav_Soma from '../../images/meettheteamImages/Pranav_Soma.jpeg';
+import Nikitha_Maderamitla from '../../images/meettheteamImages/Nikitha_Maderamitla.jpg';
+import Aryen_Singhal from '../../images/meettheteamImages/Aryen_Singhal.jpg';
+import Hillary_Chang from '../../images/meettheteamImages/Hillary_Chang.webp';
+import Aditya_Kakarla from '../../images/meettheteamImages/Aditya_Kakarla.jpg';
+import Chase_Peterson from '../../images/meettheteamImages/Chase_Peterson.jpg';
+import Tia_Irani from '../../images/meettheteamImages/Tia_Irani.jpeg';
+import Steven_Shi from '../../images/meettheteamImages/Steven_Shi.jpg';
+import Vinod_Vairavaraj from '../../images/meettheteamImages/Vinod_Vairavaraj.png';
+import Shree_Venkatesh from '../../images/meettheteamImages/Shree_Venkatesh.jpg';
+import Bhavik_Chandna from '../../images/meettheteamImages/Bhavik_Chandna.jpg';
+import Kevin_Sun from '../../images/meettheteamImages/Kevin_Sun.jpg';
+import Aryamun_Das from '../../images/meettheteamImages/Ryan_Das.jpeg';
+import Aditi_Bansal from '../../images/meettheteamImages/Aditi_Bansal.jpg';
+import Lucas_Hlaing from '../../images/meettheteamImages/Lucas_Hiaing.jpeg';
+import Varun_Parekh from '../../images/meettheteamImages/Varun_Parekh.jpg';
const categories = [
{
id: 1,
name: 'CSES Board',
members: [
- { name: 'Nabil Khoury', title: 'Co-President', photo: Nabil },
- { name: 'Samvrit Srinath', title: 'Co-President', photo: Samvrit },
{ name: 'Rahul Mistry', title: 'VP Internal', photo: Rahul },
{ name: 'Michael He', title: 'VP External', photo: Michael },
{ name: 'Sithu Soe', title: 'VP Operations', photo: Sithu },
- { name: 'Anuj Jain', title: 'VP Finance', photo: Anuj },
- { name: 'Maanasa Prasad', title: 'Event Director', photo: Maanasa },
- { name: 'Ishika Agrawal', title: 'Events Director', photo: Ishika },
- { name: 'Christopher Tams', title: 'Marketing Director', photo: Christopher },
- { name: 'Shambhavi Mittal', title: 'PR Director', photo: Shambhavi },
- { name: 'Cassandra Ponce Maldonado', title: 'Events Chair', photo: Cassandra },
+ { name: 'Maanasa Prasad', title: 'VP Events', photo: Maanasa },
+ { name: 'Lucas Hlaing', title: 'Finance Director', photo: Lucas_Hlaing },
+ { name: 'Varun Parekh', title: 'Technical Workshop Director', photo: Varun_Parekh },
{ name: 'Angelina Yee', title: 'Marketing Chair', photo: Angelina },
- { name: 'Rachel Paner', title: 'Design Chair', photo: Rachel },
- { name: 'Jose Martinez', title: 'Outreach Chair - Alumni', photo: Jose },
- { name: 'Ketan Jain', title: 'Outreach Chair - Student Organizations', photo: Ketan },
- { name: 'Cole Carter', title: 'Outreach Chair - Sponsors/Corporates', photo: Cole },
+ { name: 'Jose Martinez', title: 'External Director - Alumni and Professor', photo: Jose },
],
},
{
id: 2,
name: 'CSES Dev',
members: [
- { name: 'Will Hsu', title: 'Engineering Manager', photo: Will },
- { name: 'Delvin Bajoua', title: 'Product Manager', photo: Delvin },
- { name: 'Shreya Gupta', title: 'Development Team Chair', photo: Shreya },
+ { name: 'Shreya Gupta', title: 'President', photo: Shreya },
+ { name: 'Steven Shi', title: 'VP Products', photo: Steven_Shi },
+ { name: 'Jake Villasenor', title: 'VP Design', photo: Jake },
{ name: 'Sardor Sobirov', title: 'Frontend Developer', photo: Sardor },
{ name: 'Sithu Soe', title: 'Frontend Developer', photo: Sithu },
- { name: 'Joyce Lu', title: 'Frontend Developer', photo: Joyce },
{ name: 'Kevin Wu', title: 'Frontend Developer', photo: KevinW },
{ name: 'Shreya Nagunuri', title: 'Backend Developer', photo: ShreyaN },
- { name: 'Victor Kim', title: 'Backend Developer', photo: Victor },
{ name: 'Brian Liu', title: 'Backend Developer', photo: Brian },
{ name: 'Ganesh Kumarappan', title: 'Backend Developer', photo: Ganesh },
],
@@ -91,17 +75,28 @@ const categories = [
members: [
{ name: 'Yashil Vora', title: 'President', photo: Yashil },
{ name: 'Mishka Jethwani', title: 'VP Operations', photo: Mishka },
+ { name: 'Aryen Singhal', title: 'Engineering Manager', photo: Aryen_Singhal },
+ { name: 'Chase Peterson', title: 'Engineering Manager', photo: Chase_Peterson },
+ { name: 'Shree Venkatesh', title: 'Engineering Manager', photo: Shree_Venkatesh },
+ { name: 'Kevin Sun', title: 'Engineering Manager', photo: Kevin_Sun },
{ name: 'Kevin Kim', title: 'Lead Software Engineer', photo: Kevin },
{ name: 'Sofia Nguyen', title: 'UI/UX Designer', photo: Sofia },
- { name: 'Song Hee Seo (Gloria)', title: 'Marketing Chair', photo: Gloria },
+ { name: 'Tia Irani', title: 'UI/UX Designer', photo: Tia_Irani },
+ { name: 'Aditi Bansal', title: 'UI/UX Designer', photo: Aditi_Bansal },
+ { name: 'Vinod Vairavaraj', title: 'UI/UX Designer', photo: Vinod_Vairavaraj },
],
},
{
- id: 5,
- name: 'CSES Innovate',
+ id: 6,
+ name: 'CSES E/Acc',
members: [
- { name: 'Viren Nathan', title: 'President', photo: Viren },
- { name: 'Ali Alani', title: 'CTO', photo: Ali },
+ { name: 'Aryamun Das', title: 'Founder', photo: Aryamun_Das },
+ { name: 'Yashil Vora', title: 'President', photo: Yashil },
+ { name: 'Nikitha Maderamitla', title: 'Internal Director', photo: Nikitha_Maderamitla },
+ { name: 'Hillary Chang', title: 'Corporate Connections Director', photo: Hillary_Chang },
+ { name: 'Aditya Kakarla', title: 'External Director', photo: Aditya_Kakarla },
+ { name: 'Pranav Soma', title: 'Project Lead', photo: Pranav_Soma },
+ { name: 'Bhavik Chandna', title: 'Project Lead', photo: Bhavik_Chandna },
],
},
];
diff --git a/frontend/src/components/About/OurCommunities.tsx b/frontend/src/components/About/OurCommunities.tsx
index c73af208..cacf0635 100644
--- a/frontend/src/components/About/OurCommunities.tsx
+++ b/frontend/src/components/About/OurCommunities.tsx
@@ -133,27 +133,6 @@ const Communities = () => {
whileHover={{ scale: 1.1 }}
transition={{ type: 'spring', stiffness: 300 }}
>
-
- 
-
-
- CSES Innovate
-
-
- Learn about tech entrepreneurship! Form teams and build your own start-ups from ideation to pitch.
-
-
-