Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion src/components/AboutUsBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default function AboutUsBox() {
return (
<>
<Box className={classes.bigbadBackground} ref={myRef}>
<Grid container style={{ padding: '2rem' }} alignContent="center" justify="center">
<Grid container style={{ padding: '2rem' }} alignContent="center" justifyContent="center">
<Grid item>
<Box>
<h1>
Expand Down
152 changes: 152 additions & 0 deletions src/components/Aluminiapi.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
import React from 'react';
Copy link
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';

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,index) => (
<Accordion
key={index}
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} justifyContent="center">
{members[batch].map(member => (
<Grid item xs={12} md={4} key={member.id}>
<Avatar name={member.name} position={member.position} src={member.image} />
</Grid>
))}
</Grid>
</AccordionDetails>
</Accordion>
))}
</Paper>
<br />
</>
)
}
</>
);
}
26 changes: 21 additions & 5 deletions 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 All @@ -29,8 +44,9 @@ export default function AlumniAccordions(props) {
Alumni
</Typography>
<GiveMeABreak num={2} />
{Object.keys(members).map(batch => (
{Object.keys(members).map((batch,index) => (
<Accordion
key={index}
style={{
borderLeft: '1px solid ' + color,
borderBottom: '2px solid ' + color,
Expand All @@ -42,9 +58,9 @@ export default function AlumniAccordions(props) {
<Typography>{batch}</Typography>
</AccordionSummary>
<AccordionDetails>
<Grid container spacing={2} justify="center">
{members[batch].map(member => (
<Grid item xs={12} md={4}>
<Grid container spacing={2} justifyContent="center">
{members[batch].map((member,index) => (
<Grid item xs={12} md={4} key={index}>
<Avatar name={member.name} position={member.position} src={member.image} />
</Grid>
))}
Expand Down
2 changes: 1 addition & 1 deletion src/components/AppBarMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export default function AppBarMenu(props) {
let listitems = props.items;
let items = listitems.map(item => {
return (
<Link to={item.link} className={classes.menuitem}>
<Link to={item.link} className={classes.menuitem} key={item.name}>
<ListItem onClick={() => handleDrawer(false)} button key={item.name} className={classes.nested}>
<ListItemText primary={item.name} />
</ListItem>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ArticlesBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export default function FrontBox() {
return (
<>
<Box className={classes.bigbadBackground} ref={myRef}>
<Grid container style={{ padding: '2rem' }} alignContent="center" justify="center">
<Grid container style={{ padding: '2rem' }} alignContent="center" justifyContent="center">
<Grid item>
<Box>
<h1 style={{ paddingTop: '10%' }}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/EventsBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export default function EventsBox() {
return (
<>
<Box className={classes.bigbadBackground} ref={myRef}>
<Grid container style={{ padding: '2rem' }} alignContent="center" justify="center">
<Grid container style={{ padding: '2rem' }} alignContent="center" justifyContent="center">
<Grid item>
<Box>
<h1>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default function Footer(props) {
<footer>
<Box sm={12} className={classes.root}>
<Container maxWidth="xl">
<Grid container spacing={1} justify="space-evenly">
<Grid container spacing={1} justifyContent="space-evenly">
<Grid item xs={12} md={6} lg={2} key={1}>
<Typography className={classes.typography} variant="h6">
Useful links
Expand Down Expand Up @@ -106,7 +106,7 @@ export default function Footer(props) {
<br />
</Typography>
<br />
<Grid container justify="space-between" style={{ paddingRight: 60 }}>
<Grid container justifyContent="space-between" style={{ paddingRight: 60 }}>
<IconButton
href="https://instagram.com/ieee_rvce?igshid=1hbfgquvdu0yt"
target="_blank"
Expand Down
4 changes: 2 additions & 2 deletions src/components/FrontBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default function FrontBox() {
return (
<>
<Box className={classes.bigbadBackground} ref={myRef}>
<Grid container style={{ padding: '2rem' }} alignContent="center" justify="center">
<Grid container style={{ padding: '2rem' }} alignContent="center" justifyContent="center">
<Grid item>
<Box display={{ xs: 'none', sm: 'block' }}>
<img className={classes.logoimage} src={images.logos.ieee_rvce_new_white_big} alt="logo" />
Expand All @@ -82,7 +82,7 @@ export default function FrontBox() {
</Grid>
<br />

<Grid container alignItems="center" justify="center">
<Grid container alignItems="center" justifyContent="center">
<Grid item>
<Link to="/about" className={classes.noUnderline}>
<Button
Expand Down
6 changes: 3 additions & 3 deletions src/components/FrontText.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function FrontText() {
const classes = useStyles();
return (
<>
<Grid className={classes.less} container justify="space-around" alignItems="center" spacing={2}>
<Grid className={classes.less} container justifyContent="space-around" alignItems="center" spacing={2}>
<Grid item sm={12} md={6}>
<Typography variant="h4">What we do</Typography>
<br />
Expand All @@ -38,7 +38,7 @@ export default function FrontText() {
className={classes.less}
direction="row-reverse"
container
justify="space-around"
justifyContent="space-around"
alignItems="center"
spacing={2}
>
Expand All @@ -58,7 +58,7 @@ export default function FrontText() {
className={classes.less}
direction="row-reverse"
container
justify="space-around"
justifyContent="space-around"
alignItems="center"
spacing={2}
>
Expand Down
10 changes: 5 additions & 5 deletions src/components/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ export default function Header(props) {
const Buttons = () => {
let buttons = navs.map(nav => {
if (nav.name === 'Societies') {
return <AppBarMenu name={nav.name} items={societies} />;
return <AppBarMenu name={nav.name} items={societies} key={nav.name}/>;
} else if (nav.name === 'Affinities') {
return <AppBarMenu name={nav.name} items={affinities} />;
return <AppBarMenu name={nav.name} items={affinities} key={nav.name}/>;
} else if (nav.name === 'Login') {
if (loggedin) {
return (
Expand Down Expand Up @@ -185,9 +185,9 @@ export default function Header(props) {
<List>
{navs.map(nav => {
if (nav.name === 'Societies') {
return <AppBarMenu drawerHandle={setDrawer} name={nav.name} items={societies} />;
return <AppBarMenu drawerHandle={setDrawer} name={nav.name} items={societies} key={nav.name}/>;
} else if (nav.name === 'Affinities') {
return <AppBarMenu drawerHandle={setDrawer} name={nav.name} items={affinities} />;
return <AppBarMenu drawerHandle={setDrawer} name={nav.name} items={affinities} key={nav.name}/>;
} else if (nav.name === 'Login') {
if (loggedin) {
return (
Expand All @@ -200,7 +200,7 @@ export default function Header(props) {
}
} else {
return (
<Link to={nav.link} className={classes.nav}>
<Link to={nav.link} className={classes.nav} key={nav.name}>
<ListItem onClick={handleDrawerToggle(false)} button key={nav.name}>
<ListItemText primary={nav.name} />
</ListItem>
Expand Down
4 changes: 2 additions & 2 deletions src/components/MembershipBox.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export default function MembershipBox() {
return (
<>
<Box className={classes.bigbadBackground} ref={myRef}>
<Grid container alignContent="center" justify="center">
<Grid container alignContent="center" justifyContent="center">
<Grid item>
<Box>
<h1>
Expand All @@ -84,7 +84,7 @@ export default function MembershipBox() {

<GiveMeABreak num={2} />
</Grid>
<Grid container alignItems="center" justify="center">
<Grid container alignItems="center" justifyContent="center">
<Grid item>
<HashLink smooth to="#whyjoinieee" className={classes.noUnderline}>
<Button
Expand Down
Loading