Skip to content

Commit 3e377df

Browse files
committed
fixed double rendering
1 parent e390688 commit 3e377df

File tree

4 files changed

+29
-46
lines changed

4 files changed

+29
-46
lines changed

frontend/family_tree/src/App.js

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useState } from "react";
1+
import React, { useLayoutEffect, useState } from "react";
22
import './App.css';
33
import Help from './Components/Help.js';
44
import SearchBar from "./Components/SearchBar";
@@ -17,16 +17,7 @@ function App() {
1717
}
1818
});
1919

20-
const [name, setCardName] = useState("name");
21-
const [branch, setCardBranch] = useState("branch");
22-
const [year, setCardYear] = useState("year");
23-
const [email, setCardEmail] = useState("email");
24-
const [picture, setCardPicture] = useState("picture");
25-
const [linkedIn, setCardLinkedIn] = useState("name");
26-
const [hometown, setCardHometown] = useState("name");
27-
const [coCurriculars, setCardCoCurriculars] = useState("");
28-
const [socialMedia, setCardSocialMedia] = useState("name");
29-
const [display, setCardDisplay] = useState(true);
20+
const [details, setDetails] = useState({ name:"name", branch:"branch", year:"year", email:"email", picture:"picture", linkedIn:"", hometown:"", coCurriculars:"", socialMedia:"", display:true});
3021

3122
return (
3223
<ThemeProvider theme={theme}>
@@ -36,29 +27,21 @@ function App() {
3627
<Help />
3728
</div>
3829

39-
<D3Tree setCardName={setCardName}
40-
setCardBranch={setCardBranch}
41-
setCardYear={setCardYear}
42-
setCardEmail={setCardEmail}
43-
setCardPicture={setCardPicture}
44-
setCardLinkedIn={setCardLinkedIn}
45-
setCardHometown={setCardHometown}
46-
setCardCoCurriculars={setCardCoCurriculars}
47-
setCardSocialMedia={setCardSocialMedia}
48-
setCardDisplay = {setCardDisplay}
30+
<D3Tree
31+
setDetails = {setDetails}
4932
/>
5033

5134
<PCard
52-
branch={branch}
53-
name={name}
54-
year={year}
55-
email={email}
56-
picture={picture}
57-
linkedIn={linkedIn}
58-
hometown={hometown}
59-
coCurriculars={coCurriculars}
60-
socialMedia={socialMedia}
61-
display= {display}
35+
branch={details.branch}
36+
name={details.name}
37+
year={details.year}
38+
email={details.email}
39+
picture={details.picture}
40+
linkedIn={details.linkedIn}
41+
hometown={details.hometown}
42+
coCurriculars={details.coCurriculars}
43+
socialMedia={details.socialMedia}
44+
display= {details.display}
6245
/>
6346
</div>
6447
</ThemeProvider>

frontend/family_tree/src/Components/ProfileCard.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,11 @@ function PCard(props) {
113113
<Divider variant="middle" />
114114
<br />
115115
<Box sx={{ color: "#2a4158" ,textAlign:"center"}}>
116-
{/* {props.coCurriculars.map((item) => (
116+
{props.coCurriculars.map((item) => (
117117
<Typography variant="body2" key={item} gutterBottom>
118118
{item}
119119
</Typography>
120-
))} */}
121-
{props.coCurriculars}
120+
))}
122121
</Box>
123122
</React.Fragment>
124123
)}

frontend/family_tree/src/Components/Tree.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,17 @@ function D3Tree(props){
5858
})
5959
.on('click', click)
6060
.on('contextmenu', function(node,d){
61-
props.setCardName(d.id);
62-
props.setCardBranch(d.data.student.branch);
63-
props.setCardYear(d.data.student.year);
64-
props.setCardEmail(d.data.student.email);
65-
props.setCardPicture(d.data.student.picture);
66-
props.setCardLinkedIn(d.data.student.linkedIn);
67-
props.setCardHometown(d.data.student.hometown);
68-
props.setCardCoCurriculars(d.data.student.coCurriculars);
69-
props.setCardSocialMedia(d.data.student.socialMedia);
70-
props.setCardDisplay(true);
61+
props.setDetails({name: d.id,
62+
branch: d.data.student.branch,
63+
year: d.data.student.year,
64+
email: d.data.student.email,
65+
picture: d.data.student.picture,
66+
linkedIn: d.data.student.linkedIn,
67+
hometown: d.data.student.hometown,
68+
coCurriculars: d.data.student.coCurriculars,
69+
socialMedia: d.data.student.socialMedia,
70+
display: true
71+
});
7172
});
7273

7374
nodeEnter.append('circle')
@@ -167,7 +168,7 @@ function D3Tree(props){
167168
update(node);
168169
}
169170
}
170-
})
171+
},[])
171172

172173
return(
173174
<div id="tree"></div>

frontend/family_tree/src/Data1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"picture": "url",
4040
"linkedIn": "url",
4141
"hometown": "Jammu",
42-
"coCurriculars": [],
42+
"coCurriculars": ["PClub head","Branch topper","6-star coder"],
4343
"socialMedia": { "insta": "link" }
4444
},
4545
"parent": "Root"

0 commit comments

Comments
 (0)