fixed git merge errors

solyuan · Nov 18, 2018 · 3c220bb · 3c220bb
1 parent 1c07f36
commit 3c220bb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/client/components/leftPanel.js b/src/client/components/leftPanel.js
@@ -34,13 +34,13 @@ const LeftPanel = (props) => {
 
       {/* this is where you write for the inside of the drawer */}
       {/* Legend */}
-      <Divider style={{'background-color':'#9CABB8'}}/>
-      <Divider style={{'background-color':'#9CABB8'}}/>
+      <Divider style={{'backgroundColor':'#9CABB8'}}/>
+      <Divider style={{'backgroundColor':'#9CABB8'}}/>
       <Legend />
 
       {/* Monitoring */}
-      <Divider style={{'background-color':'#9CABB8'}}/>
-      <Divider style={{'background-color':'#9CABB8'}}/>
+      <Divider style={{'backgroundColor':'#9CABB8'}}/>
+      <Divider style={{'backgroundColor':'#9CABB8'}}/>
       <Monitoring 
         nodes={props.nodes}
         edges={props.edges}
@@ -49,8 +49,8 @@ const LeftPanel = (props) => {
       />
 
       {/* Directions */}
-      <Divider style={{'background-color':'#9CABB8'}}/>
-      <Divider style={{'background-color':'#9CABB8'}}/>
+      <Divider style={{'backgroundColor':'#9CABB8'}}/>
+      <Divider style={{'backgroundColor':'#9CABB8'}}/>
       <Directions />
 
     </Drawer>

diff --git a/src/client/components/legend.js b/src/client/components/legend.js
@@ -67,8 +67,8 @@ class Legend extends React.Component {
                 classes={{
                   bar: classes.colorBar
                 }}
-                onChange={this.handleToggle('pod')}
-                checked={this.state.checked.indexOf('pod') !== -1}
+                onChange={() => this.props.handleLegendToggle('pod')}
+                checked={this.props.checked.indexOf('pod') !== -1}
               />
             </ListItemSecondaryAction>
           </ListItem>
@@ -85,8 +85,8 @@ class Legend extends React.Component {
                 classes={{
                   bar: classes.colorBar
                 }}
-                onChange={this.handleToggle('service')}
-                checked={this.state.checked.indexOf('service') !== -1}
+                onChange={() => this.props.handleLegendToggle('service')}
+                checked={this.props.checked.indexOf('service') !== -1}
               />
             </ListItemSecondaryAction>
           </ListItem>
@@ -103,8 +103,8 @@ class Legend extends React.Component {
                 classes={{
                   bar: classes.colorBar
                 }}
-                onChange={this.handleToggle('ingress')}
-                checked={this.state.checked.indexOf('ingress') !== -1}
+                onChange={() => this.props.handleLegendToggle('ingress')}
+                checked={this.props.checked.indexOf('ingress') !== -1}
               />
             </ListItemSecondaryAction >
           </ListItem>

diff --git a/src/client/supplement/graphOptions.js b/src/client/supplement/graphOptions.js
@@ -5,7 +5,7 @@ const options = {
       enabled: true,
       levelSeparation: 100,
       nodeSpacing: 150,
-      treeSpacing: 70,
+      treeSpacing: 40,
       blockShifting: true,
       edgeMinimization: true,
       parentCentralization: true,