Skip to content

Commit 0c29edf

Browse files
authored
Merge pull request #37 from Nkmai/cleaningComponents
Removing unused npm packages and added styling in linksControls and cleaned front end files
2 parents a75e653 + 8b22a17 commit 0c29edf

27 files changed

+428
-521
lines changed

assets/.nextjs.gif.icloud

160 Bytes
Binary file not shown.

assets/extension-console.gif

-2.47 MB
Binary file not shown.

assets/nextjs.gif

-17.6 MB
Binary file not shown.

assets/reactime-console.gif

-6.16 MB
Binary file not shown.

package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@
2525
"state",
2626
"debug",
2727
"react dev tool",
28-
"reactime"
28+
"reactime",
29+
"performance",
30+
"gatsby",
31+
"next.js",
32+
"rendering",
33+
"optimization"
2934
],
3035
"repository": {
3136
"type": "git",
@@ -35,6 +40,8 @@
3540
"Abaas Khorrami",
3641
"Andy Wong",
3742
"Bryan Lee",
43+
"Becca Viner",
44+
"Caitlin Chan",
3845
"Carlos Perez",
3946
"Chris Flannery",
4047
"David Chai",
@@ -48,6 +55,7 @@
4855
"Josh Kim",
4956
"Joshua Howard",
5057
"Kevin Fey",
58+
"Kim Mai Nguyen",
5159
"Nathanael Wa Mwenze",
5260
"Prasanna Malla",
5361
"Rajeeb Banstola",
@@ -56,6 +64,7 @@
5664
"Ruth Anam",
5765
"Ryan Dang",
5866
"Sierra Swaby",
67+
"Tania Lind",
5968
"Yujin Kang"
6069
],
6170
"license": "ISC",
@@ -90,8 +99,6 @@
9099
"jest-diff": "^26.1.0",
91100
"jest-puppeteer": "^4.4.0",
92101
"jest-runner-eslint": "^0.7.7",
93-
"minimatch": "^3.0.4",
94-
"node-sass": "^4.14.1",
95102
"puppeteer": "^5.1.0",
96103
"sass": "^1.26.10",
97104
"sass-loader": "^7.3.1",
@@ -131,13 +138,11 @@
131138
"@visx/zoom": "^1.0.0",
132139
"acorn": "^7.3.1",
133140
"acorn-jsx": "^5.2.0",
134-
"bower": "^1.8.8",
135141
"cookie": "^0.4.1",
136142
"d3": "^5.16.0",
137143
"d3-scale-chromatic": "^2.0.0",
138144
"d3-shape": "^2.0.0",
139145
"d3-zoom": "^1.8.3",
140-
"flatted": "^3.0.4",
141146
"immer": "^3.3.0",
142147
"jest-runner": "^26.1.0",
143148
"jsondiffpatch": "^0.3.11",
@@ -148,14 +153,10 @@
148153
"rc-tooltip": "^3.7.3",
149154
"react": "^16.13.1",
150155
"react-dom": "^16.13.1",
151-
"react-google-chart": "^0.1.2",
152-
"react-google-charts": "^3.0.15",
153-
"react-google-charts-ts": "^0.1.1",
154156
"react-html-parser": "^2.0.2",
155157
"react-json-tree": "^0.11.2",
156158
"react-router-dom": "^5.2.0",
157159
"react-select": "^3.1.0",
158-
"recoil": "0.0.10",
159-
"sankey": "^2.0.2"
160+
"recoil": "0.0.10"
160161
}
161162
}

src/app/components/AtomsRelationship.tsx

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
2-
31
import React, { useMemo } from 'react';
42
import { Group } from '@visx/group';
53
import { Cluster, hierarchy } from '@visx/hierarchy';
6-
//import { HierarchyPointNode, HierarchyPointLink } from '@visx/hierarchy/lib/types';
74
import { LinkVertical } from '@visx/shape';
85
import { LinearGradient } from '@visx/gradient';
96
import { StateRouteProps} from './StateRoute'
@@ -69,7 +66,6 @@ function clusterDataPopulate(props:StateRouteProps) {
6966
bothObj[key] = []
7067
}
7168

72-
7369
if(props[0].atomSelectors[key].length){
7470
for(let i=0; i<props[0].atomSelectors[key].length;i++){
7571
if(!outerobj.children) outerobj.children = []
@@ -88,7 +84,6 @@ function clusterDataPopulate(props:StateRouteProps) {
8884
if(!innerobj.children) innerobj.children = []
8985
innerobj.children.push({name:atomCompObj[props[0].atomSelectors[key][i]]})
9086
bothObj[key].push(atomCompObj[props[0].atomSelectors[key][i]][0])
91-
9287
}
9388
}
9489
outerobj.children.push(innerobj)
@@ -105,8 +100,7 @@ function clusterDataPopulate(props:StateRouteProps) {
105100
}
106101
bothObj[key].push(atomCompObj[key][i])
107102
}
108-
}
109-
103+
}
110104
clusterData.children.push(outerobj)
111105
}
112106
}
@@ -125,10 +119,8 @@ function clusterDataPopulate(props:StateRouteProps) {
125119
}
126120
}
127121
initialFire = true
128-
129122
}
130123

131-
132124
function reorganizedCompObj(props) {
133125
let atomsComponentObj = props[0].atomsComponents;
134126
let reorganizedCompObj = {};
@@ -146,7 +138,6 @@ function reorganizedCompObj(props) {
146138
}
147139

148140
function Node({ node, snapshots, dispatch, bothObj}) {
149-
// const [dispatch] = useStoreContext();
150141
const selector = node.depth === 1 && node.height === 2
151142
const isRoot = node.depth === 0;
152143
const isParent = !!node.children;
@@ -209,12 +200,9 @@ function RootNode({ node }) {
209200
x={centerX}
210201
rx="10"
211202
ry="10"
212-
// fill="url('#top')"
213203
/>
214204
<text
215205
dy=".33em"
216-
// top={node.y}
217-
// left={node.x}
218206
fontSize={9}
219207
fontFamily="Arial"
220208
textAnchor="middle"
@@ -277,12 +265,6 @@ function removeDup(bothObj){
277265

278266
const defaultMargin = { top: 40, left: 0, right: 0, bottom: 40 };
279267

280-
// export type DendrogramProps = {
281-
// width: number;
282-
// height: number;
283-
// margin?: { top: number; right: number; bottom: number; left: number };
284-
// };
285-
286268
export default function AtomsRelationship({
287269
width,
288270
height,
@@ -306,9 +288,7 @@ export default function AtomsRelationship({
306288
return width < 10 ? null : (
307289
<>
308290
<div>
309-
<Legend
310-
// hierarchy = {hierarchy}
311-
/>
291+
<Legend />
312292
</div>
313293
<svg width={width} height={height}>
314294

0 commit comments

Comments
 (0)