Skip to content
Permalink
Browse files

to merge with local master branch

  • Loading branch information
johnnycoyle committed May 16, 2017
1 parent 08c27ce commit 5dc6f86abf02f052e33dfb23631d06890a46fe56
Showing with 152 additions and 1,192 deletions.
  1. +0 −3 .vscode/settings.json
  2. 0 app/{components → assets}/DataItemList.css
  3. +2 −1 app/{containers/styles → assets}/app.css
  4. 0 app/{components/styles → assets}/colors.js
  5. +21 −10 app/{components/styles/visualizer.css → assets/componentView.css}
  6. 0 app/{components/styles → assets}/customtooltip.css
  7. 0 app/{components/styles → assets}/displayed_graphs.css
  8. 0 app/{components/styles → assets}/graph_picker.css
  9. +0 −1 app/{components/styles → assets}/plot.css
  10. +21 −2 app/assets/profileView.css
  11. 0 app/{components/styles → assets}/profile_graph_transitions.css
  12. +5 −0 app/{components/styles → assets}/profilechart.css
  13. 0 app/{components/styles → assets}/toolbar.css
  14. 0 app/{containers/styles → assets}/transitions.css
  15. +2 −2 app/{components/styles/graph_transitions.css → assets/viewEnterTransitions.css}
  16. +2 −2 app/{components/styles → assets}/viewcontroller.css
  17. +33 −0 app/assets/viewvisibility.css
  18. +1 −1 app/components/DataItem.js
  19. +2 −2 app/components/DisplayedGraphs.js
  20. +2 −3 app/components/GraphPicker.js
  21. +11 −23 app/components/PerfComponent.js
  22. +5 −18 app/components/Plot.js
  23. +0 −209 app/components/PlotOne.js
  24. +3 −4 app/components/ProfileChart.js
  25. +1 −11 app/components/Toolbar.js
  26. +0 −23 app/components/TwoPaneToggle.js
  27. +2 −4 app/components/ViewController.js
  28. +0 −264 app/components/VisualizerOne.js
  29. BIN app/components/styles/Tachometer_hover.png
  30. BIN app/components/styles/background_texture.png
  31. BIN app/components/styles/bannerLogo.jpg
  32. BIN app/components/styles/bannerLogo.png
  33. BIN app/components/styles/bannerLogo.psd
  34. BIN app/components/styles/bannerLogoTiny.png
  35. BIN app/components/styles/banner_logo.png
  36. BIN app/components/styles/bg_blue_texture.png
  37. BIN app/components/styles/bg_blue_texture.psd
  38. BIN app/components/styles/bg_container_texture.png
  39. BIN app/components/styles/bg_dataitem_texture.png
  40. BIN app/components/styles/bg_dataitem_texture.psd
  41. BIN app/components/styles/bg_graph_texture.png
  42. BIN app/components/styles/bg_graph_texture.psd
  43. BIN app/components/styles/bg_panel_texture.png
  44. BIN app/components/styles/bg_panel_texture.psd
  45. BIN app/components/styles/bg_toolbar_texture.png
  46. BIN app/components/styles/bg_toolbar_texture.psd
  47. BIN app/components/styles/button_texture.png
  48. +0 −4 app/components/styles/colors.scss
  49. BIN app/components/styles/react_50s_justTextTitle.png
  50. BIN app/components/styles/react_trials_logo.png
  51. BIN app/components/styles/tachometer.png
  52. 0 app/config/env.dev.js
  53. +0 −5 app/config/env.js
  54. 0 app/config/env.prod.js
  55. +13 −14 app/containers/App.js
  56. +18 −33 app/{components/Visualizer.js → containers/ComponentView.js}
  57. +0 −14 app/containers/DevTools.js
  58. +8 −12 app/containers/ProfileView.js
  59. +0 −8 build/contentLoader.js
  60. +0 −27 chrome/extension/background/background.js
  61. +0 −87 chrome/extension/background/eventPage.js
  62. +0 −16 chrome/extension/content/contentScript.js
  63. +0 −7 chrome/extension/content/index.js
  64. +0 −10 chrome/extension/content/pageScriptWrap.dev.js
  65. +0 −11 chrome/extension/content/pageScriptWrap.prod.js
  66. +0 −3 chrome/extension/page/index.js
  67. +0 −38 chrome/extension/page/mockConsole.js
  68. +0 −85 chrome/extension/page/pageScript.js
  69. +0 −74 chrome/extension/page/shapeMeasurements.js
  70. +0 −14 dev/background.js
  71. +0 −8 dev/contentLoader.js
  72. +0 −11 dev/devtools.js
  73. +0 −6 rollup.config.dev.js
  74. +0 −1 sample_perfs.js
  75. +0 −62 spec/chrome/mockConsole.spec.js
  76. +0 −59 webpack.config.npm.js

This file was deleted.

File renamed without changes.
@@ -125,4 +125,5 @@
left:9%;
top:10%;
animation: logoFadeIn 3s ease-out;
}
}

File renamed without changes.
@@ -5,16 +5,6 @@ $lightGrey: #f4f4f4;
$reactBlue: #00d8ff;
*/

#plotContainer{
position:absolute;
display:block;
margin-right:auto;
margin-left:auto;
width:100%;
height:100%;
margin-top:10px;
}

#plotWrapper{
position:relative;
display:block;
@@ -26,3 +16,24 @@ $reactBlue: #00d8ff;
height:fit-content;
}

#mainContainer{
position:absolute;
display:block;
margin-right:auto;
margin-left:auto;
width:100%;
height:100%;
margin-top:10px;
}

#mainContainer.componentOnScreen{
left:0;
opacity:1;
transition: left 500ms, opacity 500ms ease-in;
}

#mainContainer.componentOffScreen{
opacity:0;
left:200%;
transition: left 500ms, opacity 500ms ease-in;
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -22,7 +22,6 @@
margin-left:auto;
width:650px;
height:30px;
background: url('./bg_dataitem_texture.png');
background-repeat:repeat;
font-size:11px;
}
@@ -27,7 +27,26 @@ td {
padding: 2px;
}

.mainContainer{
position:relative;

#mainContainer{
position:absolute;
display:block;
margin-right:auto;
margin-left:auto;
width:fit-content;
height:100%;
margin-top:10px;
background:red;
}

#mainContainer.profileOnScreen{
opacity: 1;
left:10%;
transition: left 500ms, opacity 500ms ease-in-out;
}

#mainContainer.profileOffScreen{
opacity:0;
left:200%;
transition: left 500ms, opacity 500ms ease-in-out;
}
File renamed without changes.
@@ -11,12 +11,17 @@
.chartContainer{
position:relative;
display:block;
margin-right:auto;
margin-left:auto;
margin-top:62px;
}

.barChartContainer{
width:fit-content;
height:fit-content;
margin-right:auto;
margin-left:auto;
position:relative;
margin-bottom:10px;
padding-right:40px;
background:rgba(48,43,57,.95);
File renamed without changes.
File renamed without changes.
@@ -47,7 +47,7 @@
animation-timing-function: ease-out;
/*transition: opacity 1500ms ease-in;*/
}
.enter.enterActive {
/*.enter.enterActive {
animation-name:componentEnter;
animation-duration:800ms;
animation-timing-function: ease-out;
@@ -56,5 +56,5 @@
animation-name: exit;
animation-duration:1000ms;
animation-timing-function: ease-out;
}
}*/

@@ -29,7 +29,7 @@
z-index:1;
width:70%;
box-shadow: inset 0px 0px 1px 1px rgba(63,63,63,.3);
transition: left 450ms linear;
transition: left 500ms linear;
}

.profile{
@@ -47,7 +47,7 @@
z-index:1;
width:70%;
box-shadow: inset 0px 0px 1px 1px rgba(63,63,63,.3);
transition: left 450ms linear;
transition: left 500ms linear;
}


@@ -0,0 +1,33 @@
.mainContainer{
position:absolute;
display:block;
margin-right:auto;
margin-left:auto;
width:100%;
height:100%;
margin-top:10px;
}

.componentOnScreen{
left:0;
opacity:1;
/*transition: left 1s, opacity 1s ease-in-out;*/
}

.componentOffScreen{
left:-200%;
opacity:0;
/*transition: left 1s, opacity 1s ease-in-out;*/
}

.profileOnScreen{
left:0;
opacity:0;
/*transition: left 1s ease-in-out;*/
}

.profileOffScreen{
opacity:0;
left:+200%;
/*transition: left 1s ease-in-out;*/
}
@@ -1,5 +1,5 @@
import React, { PropTypes } from 'react';
import styles from './DataItemList.css';
import styles from './../assets/DataItemList.css';



@@ -1,6 +1,6 @@
import React, { PropTypes } from 'react';
import styles from './styles/displayed_graphs.css';
import { colors } from './styles/colors.js';
import styles from './../assets/displayed_graphs.css';
import { colors } from './../assets/colors.js';

const DisplayedGraphs = (props) => {

@@ -1,7 +1,6 @@
import React, { Component } from 'react';
import styles from './styles/graph_picker.css'
import styles from './../assets/graph_picker.css'
import Select from 'react-select';
require('./styles/button_texture.png');

class GraphPicker extends Component {

@@ -40,7 +39,7 @@ class GraphPicker extends Component {

componentWillReceiveProps(props){
this.componentOptions = this.loadOptions(this.props.allComponents);
console.log('\n\n\n\n\n logging from graph picker: \n',this.props.allComponents);
this.props.allComponents;
this.forceUpdate();
}
updateComponentValue (newValue) {
@@ -26,12 +26,13 @@ export default class PerfComponent {

this.currentlyRenderedMetrics = [];

// console.log(
// '-------------------------\n',
// '* New Component Created *\n',
// '\tName:',this.name,'\n',
// '-------------------------\n',
// )
console.log(
'-------------------------\n',
'-----[Component View]----\n',
'* New Perf Component Created *\n',
'\tName:',this.name,'\n',
'-------------------------\n',
)
}

//This method is ONLY called in the PerfComponents constructor to create the component.
@@ -70,7 +71,6 @@ export default class PerfComponent {
return [emptyRenderTemplate, emptySummaryTemplate];
}

//this sets a metric to active on a specific graph, or turns it off.
toggleActiveMetric(category, metric, graph, graphStyle=null, color=null) {
if (graphStyle && color) {
this[category][metric].graphDisplay = graphStyle
@@ -103,18 +103,6 @@ export default class PerfComponent {
activeMetrics.push(this.RENDER[metric].cache);
})
})
// }else {
// Object.keys(this.SUMMARY).forEach(metric => {
// if (this.SUMMARY[metric].activeGraphs[i]) {
// activeMetrics.push( [
// this[category][metric],
// this.name,
// metric,
// i,
// this.getValue('SUMMARY', metric)
// ]);
// }
// })
return activeMetrics;
}

@@ -124,10 +112,10 @@ export default class PerfComponent {

addValue(value, category, metric) {
this[category][metric].data.push(value);
console.log('[PERFCOMONENT]:',this.name,'\n',
'Adding value to:', metric,'\n',
'New value of data array:', this[category][metric].data
)
// console.log('[PERFCOMONENT]:',this.name,'\n',
// 'Adding value to:', metric,'\n',
// 'New value of data array:', this[category][metric].data,'\n'
// )
}

getValue(category, metric) {
@@ -11,16 +11,13 @@ import {
Legend,
Brush
} from 'Recharts';
import TwoPaneToggle from './TwoPaneToggle';
import DataItemList from './DataItemList';
import CustomToolTip from './CustomToolTip';
import styles from './styles/plot.css';
import { colors } from './styles/colors.js';
import graph_transitions from './styles/profile_graph_transitions.css';
import styles from './../assets/plot.css';
import { colors } from './../assets/colors.js';
import viewEnterTransitions from './../assets/viewEnterTransitions.css';
import ReactTransition from 'react-transition-group/CSSTransitionGroup';

require('./styles/tachometer.png');

const Plot = (props) => {

const {
@@ -115,12 +112,10 @@ const Plot = (props) => {
}
}
});
console.log(graphRenders);
});

const getGraphComponentForRender = (num) => {
let arr = [];
console.log('graphRenders:\n',graphRenders)
Object.keys(graphRenders[num]).forEach(el => {
arr.push(graphRenders[num][el]);
})
@@ -145,14 +140,8 @@ const Plot = (props) => {
let mainGraphParams;
let graphOutput = (<div id={styles.graphPlaceholder}></div>)

console.log('compiledGraphData:',compiledGraphData,'\n');
console.log('graphRenders length',graphRenders.length)

if (compiledGraphData.length) {
console.log('****\ngenerating graph\n****')
mainGraphParams = getGraphParams(0);
console.log('mainGraphParams:',mainGraphParams);
console.log('data:',mainGraphParams.data);
graphOutput = (
<ComposedChart
width={600}
@@ -172,14 +161,12 @@ const Plot = (props) => {
);
}

console.log('graphoutput:',graphOutput);

return (
<div>
<ReactTransition
transitionName={graph_transitions}
transitionName={viewEnterTransitions}
transitionAppear={true}
transitionAppearTimeout={1000} transitionEnterTimeout={800} transitionLeaveTimeout={800}>
transitionAppearTimeout={1000} transitionEnterTimeout={0} transitionLeaveTimeout={0}>
<div id={styles.graphContainer}>
{graphOutput}
</div>

0 comments on commit 5dc6f86

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