Skip to content

Commit beecf40

Browse files
committed
Used conditional rendering
1 parent 9295636 commit beecf40

File tree

2 files changed

+34
-25
lines changed

2 files changed

+34
-25
lines changed

frontend/family_tree/src/App.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ function App() {
3737
hometown={x.student.hometown}
3838
coCurriculars={x.student.coCurriculars}
3939
socialMedia={x.student.socialMedia}
40+
display= {true}
4041
/>
4142

4243
</div>

frontend/family_tree/src/Components/ProfileCard.js

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,21 @@ const useStyles = makeStyles((theme) => ({
3737
"&:hover": {
3838
opacity: "1",
3939
transform: "translate(0,-5px)",
40-
background: "rgba(255,255,255,0.5)"
4140
}
4241
}
4342
}));
4443

4544
function PCard(props) {
4645
const classes = useStyles();
47-
const [display, setDisplay] = React.useState("");
48-
46+
const [isVisible, setisVisible] = React.useState(props.display?true:false);
47+
const toggle = () => setisVisible(!isVisible);
4948
return (
5049
<React.Fragment>
51-
<Card className={classes.root} variant="outlined" style={{display:display}}>
50+
{ isVisible && (
51+
<Card className={classes.root} variant="outlined" >
5252
<Box sx={{ display: "flex", justifyContent: "right" }}>
5353
<CardActions>
54-
<IconButton aria-label="close" onClick={()=>setDisplay("none")} >
54+
<IconButton aria-label="close" onClick={toggle} >
5555
<CloseOutlinedIcon />
5656
</IconButton>
5757
</CardActions>
@@ -132,70 +132,78 @@ function PCard(props) {
132132
>
133133
<CardActions>
134134
{props.email && (
135-
<Link href={`mailto:${props.email}`}>
136-
<IconButton className={classes.socialMediaButton}>
135+
<IconButton
136+
className={classes.socialMediaButton}
137+
component = {Link}
138+
href={`mailto:${props.email}`}
139+
>
137140
<MailIcon color="primary" />
138141
</IconButton>
139-
</Link>
140142
)}
141143

142144
{props.linkedIn && (
143-
<Link href={props.linkedIn} target="_blank">
144-
<IconButton
145-
aria-label="linkedin"
146-
className={classes.socialMediaButton}
147-
>
148-
<LinkedInIcon color="primary" />
149-
</IconButton>
150-
</Link>
151-
)}
145+
<IconButton
146+
aria-label="linkedin"
147+
className={classes.socialMediaButton}
148+
component = {Link}
149+
target="_blank"
150+
href={props.linkedIn}
151+
>
152+
<LinkedInIcon color="primary" />
153+
</IconButton>
154+
)}
152155

153156
{props.socialMedia && props.socialMedia.insta && (
154-
<Link href={props.socialMedia.insta} target="_blank">
155157
<IconButton
156158
aria-label="instagram"
157159
className={classes.socialMediaButton}
160+
component = {Link}
161+
target="_blank"
162+
href={props.linkedIn}
158163
>
159164
<InstagramIcon color="primary" />
160165
</IconButton>
161-
</Link>
162166
)}
163167

164168
{props.socialMedia && props.socialMedia.github && (
165-
<Link href={props.socialMedia.github} target="_blank">
166169
<IconButton
167170
aria-label="github"
168171
className={classes.socialMediaButton}
172+
component = {Link}
173+
target="_blank"
174+
href={props.linkedIn}
169175
>
170176
<GitHubIcon color="primary" />
171177
</IconButton>
172-
</Link>
173178
)}
174179

175180
{props.socialMedia && props.socialMedia.facebook && (
176-
<Link href={props.socialMedia.facebook} target="_blank">
177181
<IconButton
178182
aria-label="facebook"
179183
className={classes.socialMediaButton}
184+
component = {Link}
185+
target="_blank"
186+
href={props.linkedIn}
180187
>
181188
<FacebookIcon color="primary" />
182189
</IconButton>
183-
</Link>
184190
)}
185191

186192
{props.socialMedia && props.socialMedia.twitter && (
187-
<Link href={props.socialMedia.twitter} target="_blank">
188193
<IconButton
189194
aria-label="twitter"
190195
className={classes.socialMediaButton}
196+
component = {Link}
197+
target="_blank"
198+
href={props.socialMedia.twitter}
191199
>
192200
<TwitterIcon color="primary" />
193201
</IconButton>
194-
</Link>
195202
)}
196203
</CardActions>
197204
</Box>
198205
</Card>
206+
)}
199207
</React.Fragment>
200208
);
201209
}

0 commit comments

Comments
 (0)