Skip to content
Permalink
Browse files

merge conflicts

  • Loading branch information
mjlaufer committed May 1, 2017
2 parents 3983d09 + 20f5dce commit bee60a88a2ce508b2387c4a8d4df87b626586094
Showing with 105 additions and 2 deletions.
  1. +9 −0 .babelrc
  2. +15 −0 .editorconfig
  3. +4 −0 .eslintignore
  4. +30 −0 .eslintrc
  5. +5 −0 .gitignore
  6. +2 −0 app/components/Plot.js
  7. +37 −2 app/components/Visualizer.js
  8. +2 −0 app/containers/App.js
  9. +1 −0 dev/manifest.json
@@ -0,0 +1,9 @@
{
"presets": ["es2015", "stage-2", "react"],
"plugins": ["transform-class-properties"],
"env": {
"development": {
"presets": ["react-hmre"]
}
}
}
@@ -0,0 +1,15 @@
# EditorConfig helps developers define and maintain
# consistent coding styles between different editors and IDEs.

root = true

[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 2

[*.md]
trim_trailing_whitespace = false
@@ -0,0 +1,4 @@
**/dist/*
**/node_modules/*
**/server.js
**/webpack.config*.js
@@ -0,0 +1,30 @@
{
"extends": "airbnb",
"env": {
"browser": true,
"mocha": true,
"node": true
},
"parser": "babel-eslint",
"rules": {
"react/jsx-uses-react": 2,
"react/jsx-uses-vars": 2,
"react/react-in-jsx-scope": 2,
"react/sort-comp": 0,
"react/no-multi-comp": 0,
"react/prefer-stateless-function": 0,
"react/jsx-no-bind": [2, {
'ignoreRefs': true,
'allowArrowFunctions': true,
}],
"comma-dangle": 0,
"id-length": 0,
"new-cap": 0,
"eol-last": 0,
"jsx-quotes": 0,
"consistent-return": 0
},
"plugins": [
"react"
]
}
@@ -0,0 +1,5 @@
.DS_Store
*.log
*bundle.js
node_modules
tmp.js
@@ -149,6 +149,7 @@ const Plot = (props) => {
if (twoGraphsAreActive) {
graphTwo = (
<div>
<<<<<<< HEAD
<ComposedChart width={600} height={225} data={data[1]} fill={'#C3C8CC'} syncId='anyId'>
<XAxis dataKey={'name'} label={'Render'}/>
<YAxis/>
@@ -190,6 +191,7 @@ const Plot = (props) => {
</div>
<br/>
{graphTwo}

<div className={styles.toolbarToggleTooltips}>
<DataItemList dataItems={dataItems} onDataItemClick={onDataItemClick} />
</div>
@@ -57,7 +57,7 @@ class Visualizer extends Component {
{ id: 6, selected: false, label: 'Total Time' },
],

simData: false
simData: false,
};

for (let key in this.state.allComponents[0]) {
@@ -74,7 +74,6 @@ class Visualizer extends Component {
const dataItems = this.state.dataItems;
this.setState({ dataItems });
}


// this method handles creation of PerfComponent elements and returns an array
// it accepts any number of strings (the names of the components), or a single string if we only want one.
@@ -224,9 +223,45 @@ class Visualizer extends Component {
this.setState({ tooltipValues });
}

<<<<<<< HEAD
checkIfTwoGraphsActive(){
return this.state.twoGraphsAreActive;
}
=======
removeActiveComponentFromGraph(componentName, graph) {}

render() {
const compiledGraphData = this.compileGraphData();

return (
<div id="main_container">
<div id="plot-container">

<Plot
compiledGraphData={compiledGraphData}
twoGraphsAreActive={this.state.twoGraphsAreActive}
twoGraphToggler={this.twoGraphToggler.bind(this)}
tooltipValues={this.state.tooltipValues}
dataItems={this.state.dataItems}
onDataItemClick={this.onDataItemClick.bind(this)}
/>
<Toolbar
tooltipValues={this.state.tooltipValues}
toggleTooltipValues={this.toggleTooltipValues.bind(this)}
componentsActiveOnGraphs={this.componentsActiveOnGraphs}
removeActiveComponentFromGraph={this.removeActiveComponentFromGraph.bind(this)}
/>
{/*<Tooltip content={<CustomToolTip />}
componentsActiveOnGraphs = {this.componentsActiveOnGraphs}
tooltipValues = {this.tooltipValues}
/>*/}

<button onClick={this.fireDataScript.bind(this)}>Add Data</button>
<button onClick={this.fireComponentScript.bind(this)}>
Add Component
</button>
</div>
>>>>>>> edits

render(){

@@ -24,7 +24,9 @@ class App extends Component {
console.log(JSON.stringify(this.props.perfs));
const output = (
<div>

<Visualizer perfs={this.props.perfs}/>

<DoublePanel>
<ProfileList />
<ProfileResult
@@ -2,6 +2,7 @@
"name": "ReactRPM",
"version": "0.1.0",
"description": "A Performance Visualization Tool for Optimization and Debugging",

// "icons": {
// "16": "images/logo_16.png",
// "48": "images/logo_48.png",

0 comments on commit bee60a8

Please sign in to comment.
You can’t perform that action at this time.