Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 153 additions & 0 deletions src/components/Aluminiapi.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
import React from 'react';
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is unnessary, please delete it

import { makeStyles } from '@material-ui/core/styles';
import { Paper, Typography, Accordion, AccordionSummary, AccordionDetails, Grid } from '@material-ui/core';
import Avatar from './Avatar';
import GiveMeABreak from './GiveMeABreak';
import SpacyDivider from './SpacyDivider';
import { useState } from 'react';
import { useEffect } from 'react';

const useStyles = makeStyles(theme => ({
paper: {
...theme.paper,
padding: theme.spacing(4),
backgroundColor: '#00000000',
},
}));

export default function Aluminiapi(props) {
//const { members } = props;
const classes = useStyles();


const[members,setMembers] = useState({
"2020": [
{
"name": "Risha Dassi",
"position": "Chair",
"image": "https://ieee-rvce.org/assets/images/alumni/2020/compsoc/risha.jpg"
},
{
"name": "Nischal J",
"position": "Vice Chair",
"image": "https://ieee-rvce.org/assets/images/alumni/2020/compsoc/nischal.jpg"
},
{
"name": "Chirag Bapat",
"position": "Treasurer",
"image": "https://ieee-rvce.org/assets/images/alumni/2020/compsoc/chirag.jpg"
},
{
"name": "Nikitha Srikanth",
"position": "Secretary",
"image": "https://ieee-rvce.org/assets/images/alumni/2020/compsoc/niks.jpg"
}
],
"2021": [
{
"name": "Dr. Ashok Kumar AR",
"position": "Faculty Advisor",
"image": "https://ieee-rvce.org/assets/images/alumni/2021/compsoc/ashok_sir.jpg"
},
{
"name": "Akshara Udupa",
"position": "Chair",
"image": "https://ieee-rvce.org/assets/images/alumni/2021/compsoc/akshara.jpg"
},
{
"name": "Vishal M",
"position": "Vice Chair",
"image": "https://ieee-rvce.org/assets/images/alumni/2021/compsoc/vishal.jpg"
},
{
"name": "Namya LG",
"position": "Treasurer",
"image": "https://ieee-rvce.org/assets/images/alumni/2021/compsoc/namya.jpg"
},
{
"name": "Shashank Dhavalla",
"position": "Secretary",
"image": "https://ieee-rvce.org/assets/images/alumni/2021/compsoc/shashank.jpg"
}
],
"2022": [
{
"name": "Dr. Ashok Kumar AR",
"position": "Faculty Advisor",
"image": "https://ieee-rvce.org/assets/images/alumni/2022/compsoc/ashok_sir.jpg"
},
{
"name": "Shubhaprada K P",
"position": "Chair",
"image": "https://ieee-rvce.org/assets/images/alumni/2022/compsoc/ShubhaPrada.jpeg"
},
{
"name": "Prajwal P",
"position": "Vice Chair",
"image": "https://ieee-rvce.org/assets/images/alumni/2022/compsoc/prajwal.PNG"
},
{
"name": "Sonia Singh B",
"position": "Treasurer",
"image": "https://ieee-rvce.org/assets/images/alumni/2022/compsoc/Sonia_Singh.jpeg"
},
{
"name": "Malavika Hariprasad ",
"position": "Secretary",
"image": "https://ieee-rvce.org/assets/images/alumni/2022/compsoc/Malavika_HariPrasad.jpg"
}
       ]
    }
);
// useEffect(() => {
// axios.get(hostname + `/api/execom/alumini/1`).then(response => {
// setMember(response.data.execom);
// console.log(member);
//    });

// }, []);

let color = props.color ?? '#222222';
return (
<>
{
// Check if members is not empty
members !== undefined && Object.keys(members).length !== 0 && (
<>
<SpacyDivider color={color} />
<Paper className={classes.paper} elevation={0}>
<Typography variant="h4" align="center">
Alumni
</Typography>
<GiveMeABreak num={2} />
{Object.keys(members).map(batch => (
<Accordion
style={{
borderLeft: '1px solid ' + color,
borderBottom: '2px solid ' + color,
backgroundColor: '#00000000',
boxShadow: '0px 0px 0px 0px #00000000',
}}
>
<AccordionSummary>
<Typography>{batch}</Typography>
</AccordionSummary>
<AccordionDetails>
<Grid container spacing={2} justify="center">
{members[batch].map(member => (
<Grid item xs={12} md={4}>
<Avatar name={member.name} position={member.position} src={member.image} />
</Grid>
))}
</Grid>
</AccordionDetails>
</Accordion>
))}
</Paper>
<br />
</>
)
}
</>
);
}
17 changes: 16 additions & 1 deletion src/components/AlumniAccordions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import React from 'react';
import { useState,useEffect } from 'react';
import axios from 'axios';
import { hostname } from '../links';
import { makeStyles } from '@material-ui/core/styles';
import { Paper, Typography, Accordion, AccordionSummary, AccordionDetails, Grid } from '@material-ui/core';
import Avatar from './Avatar';
Expand All @@ -14,8 +17,20 @@ const useStyles = makeStyles(theme => ({
}));

export default function AlumniAccordions(props) {
const { members } = props;
//const { members } = props;

const [members, setMembers] = useState({});

useEffect(() => {
axios.get(hostname + '/api/execom/alumini/' + props.sid).then(response => {
setMembers(response.data.alumini);
console.log(response.data.alumini);
});
}, [props.sid]);


const classes = useStyles();
// console.log(members);
let color = props.color ?? '#222222';
return (
<>
Expand Down
9 changes: 6 additions & 3 deletions src/pages/APSSocietyPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import EventCard from '../components/EventCard';
import { hostname, ecats, images, execom, alumni } from '../links';
import AlumniAccordions from '../components/AlumniAccordions';
import SpacyDivider from '../components/SpacyDivider';
import SocietyExec from './SocietyExec';

const useStyles = makeStyles(theme => ({
root: theme.root,
Expand Down Expand Up @@ -113,7 +114,7 @@ export default function APSSocietyPage(props) {
<SpacyDivider color="rgb(110 110 193)" />
</>
)}
<Paper className={classes.paper}>
{/* <Paper className={classes.paper}>
<Typography variant="h3">Executive Committee</Typography>
<br />
<Grid container spacing={2} justify="center">
Expand All @@ -123,8 +124,10 @@ export default function APSSocietyPage(props) {
</Grid>
))}
</Grid>
</Paper>
<AlumniAccordions members={alumni.aps} color="rgb(110 110 193)" />
</Paper> */}

<SocietyExec sid = {ecats.aps}/>
<AlumniAccordions members={alumni.aps} sid={ecats.aps} color="rgb(110 110 193)" />
<br />
</Container>
</div>
Expand Down
11 changes: 8 additions & 3 deletions src/pages/CASSocietyPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import EventCard from '../components/EventCard';
import { hostname, ecats, images, execom, alumni } from '../links';
import AlumniAccordions from '../components/AlumniAccordions';
import SpacyDivider from '../components/SpacyDivider';
import SocietyExec from './SocietyExec';

const useStyles = makeStyles(theme => ({
root: theme.root,
Expand Down Expand Up @@ -102,7 +103,7 @@ export default function CASSocietyPage(props) {
<SpacyDivider color="rgb(153 221 227)" />
</>
)}
<Paper className={classes.paper}>
{/* <Paper className={classes.paper}>
<Typography variant="h3">Executive Committee</Typography>
<br />
<Grid container spacing={2} justify="center">
Expand All @@ -112,8 +113,12 @@ export default function CASSocietyPage(props) {
</Grid>
))}
</Grid>
</Paper>
<AlumniAccordions members={alumni.cas} color="rgb(153 221 227)" />
</Paper> */}

<SocietyExec sid = {ecats.cas}/>
<AlumniAccordions members={alumni.cas} color="rgb(153 221 227)"
sid={ecats.cas}
/>
<br />
</Container>
</div>
Expand Down
17 changes: 13 additions & 4 deletions src/pages/COMSOCSocietyPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { hostname, ecats, images, execom, alumni } from '../links';
import { Link } from 'react-router-dom';
import AlumniAccordions from '../components/AlumniAccordions';
import SpacyDivider from '../components/SpacyDivider';
import SocietyExec from './SocietyExec';
import Aluminiapi from '../components/Aluminiapi';

const useStyles = makeStyles(theme => ({
root: theme.root,
Expand All @@ -27,7 +29,7 @@ const useStyles = makeStyles(theme => ({
},
}));

export default function COMSOCSocietyPage(_props) {
export default function COMSOCSocietyPage(props) {
const classes = useStyles();

const [events, setEvents] = useState([]);
Expand Down Expand Up @@ -97,7 +99,7 @@ export default function COMSOCSocietyPage(_props) {
<SpacyDivider color="rgb(61 144 142)" />
</>
)}
<Paper className={classes.paper}>
{/* <Paper className={classes.paper}>
<Typography variant="h3">Executive Committee</Typography>
<br />
<Grid container spacing={2} justify="center">
Expand All @@ -107,10 +109,17 @@ export default function COMSOCSocietyPage(_props) {
</Grid>
))}
</Grid>
</Paper>
<AlumniAccordions members={alumni.comsoc} color="rgb(61 144 142)" />
</Paper> */}
<SocietyExec sid = {ecats.comsoc}/>

<AlumniAccordions members={alumni.compsoc} sid={ecats.comsoc} color="rgb(61 144 142)" />
{/* <Aluminiapi /> */}

<br />
</Container>



</div>
);
}
9 changes: 5 additions & 4 deletions src/pages/CSSocietyPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import EventCard from '../components/EventCard';
import { hostname, ecats, images, execom, alumni } from '../links';
import AlumniAccordions from '../components/AlumniAccordions';
import SpacyDivider from '../components/SpacyDivider';

import SocietyExec from './SocietyExec';
const useStyles = makeStyles(theme => ({
root: theme.root,
container: theme.page,
Expand Down Expand Up @@ -106,7 +106,7 @@ export default function CSSocietyPage(props) {
<SpacyDivider color="rgb(80 161 99)" />
</>
)}
<Paper className={classes.paper}>
{/* <Paper className={classes.paper}>
<Typography variant="h3">Executive Committee</Typography>
<br />
<Grid container spacing={2} justify="center">
Expand All @@ -116,8 +116,9 @@ export default function CSSocietyPage(props) {
</Grid>
))}
</Grid>
</Paper>
<AlumniAccordions members={alumni.compsoc} color="rgb(80 161 99)" />
</Paper> */}
<SocietyExec sid = {ecats.compsoc}/>
<AlumniAccordions members={alumni.compsoc} sid = {ecats.compsoc} color="rgb(80 161 99)" />
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are we still passing the members as a prop, remove it

Suggested change
<AlumniAccordions members={alumni.compsoc} sid = {ecats.compsoc} color="rgb(80 161 99)" />
<AlumniAccordions sid = {ecats.compsoc} color="rgb(80 161 99)" />

<br />
</Container>
</div>
Expand Down
24 changes: 21 additions & 3 deletions src/pages/HomePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import GiveMeABreak from '../components/GiveMeABreak';
import EventCard from '../components/EventCard';
import axios from 'axios';
import Confetti from '../animations/Confettie';


const useStyles = makeStyles(theme => ({
'root': theme.root,
'container': theme.page,
Expand All @@ -40,12 +42,18 @@ const useStyles = makeStyles(theme => ({
export default function HomePage(props) {
const classes = useStyles();
const [events, setEvents] = useState([]);
const [member, setMember] = useState([]);
const { ref: myRef, inView: myElementIsVisible } = useInView();

useEffect(() => {
axios.get(hostname + '/api/event/cat/' + ecats.main).then(response => {
setEvents(response.data.events);
});

axios.get(hostname + `/api/execom/${ecats.main}`).then(response => {
setMember(response.data.execom);
   });

}, []);
return (
<div className={classes.root}>
Expand Down Expand Up @@ -78,16 +86,26 @@ export default function HomePage(props) {
) : null}
</div>
{/* <Grid container item xs={12} sm={6} md={4} lg={3}> */}
{execom.main.map(member => (
{/* {execom.main.map(member => (
<Grid item xs={12} sm={6} md={4} lg={4}>
<Avatar name={member.name} position={member.position} src={member.image} />
</Grid>
))}
))} */}
<Grid container spacing={2} justify="center">
{member.map(mem => {
return (
<Grid item xs={12} md={4}>
<Avatar name={mem.name} position={mem.position} src={mem.image} />
</Grid>
);
})}
</Grid>

{/* </Grid> */}
</Grid>
</Container>

<AlumniAccordions members={alumni.main} color="#12c48c" />
<AlumniAccordions members={alumni.main} sid={ecats.main} color="#12c48c" />
<SpacyDivider num={2} color="#12c48c" />
{events.length !== 0 && (
<div hidden>
Expand Down
Loading