Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
roachjc committed Oct 15, 2017
1 parent b055b8f commit 370bd68
Show file tree
Hide file tree
Showing 39 changed files with 119 additions and 290 deletions.
4 changes: 2 additions & 2 deletions client/App.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Header from './Header';
import Main from './Main';
import Header from './containers/Header';
import Main from './containers/Main';

class App extends React.Component {
constructor() {
Expand Down
4 changes: 2 additions & 2 deletions client/AppDev.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Header from './Header';
import Main from './Main';
import Header from './containers/Header';
import Main from './containers/Main';
import build from './../monitor/stats.json';

class App extends React.Component {
Expand Down
21 changes: 0 additions & 21 deletions client/chartComponents/chartsApp.jsx

This file was deleted.

36 changes: 0 additions & 36 deletions client/chartComponents/graphs/charts/utils/ReactMixins.jsx

This file was deleted.

13 changes: 6 additions & 7 deletions client/Header.jsx → client/containers/Header.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import React from 'react';
import { Link } from 'react-router-dom';
import { NavDropdown, MenuItem } from 'react-bootstrap';
import logo from './assets/wpmlogo.png';


// The Header creates links that can be used to navigate
// between routes.
import logo from './../assets/wpmlogo.png';

const getMenuItems = (buildNumber, selectBuild) => {
const menuItems = [];
Expand All @@ -20,7 +16,10 @@ const Header = (props) => {
return (
<header>
<nav>
<div className="pull-left panel-title header-title"><img className="logo" src={logo} />webpack monitor</div>
<div className="pull-left panel-title header-title">
<img alt="wpm" className="logo" src={logo} />
webpack monitor
</div>
<ul className="links list-inline pull-right">
<NavDropdown title="Select Build" id="basic-nav-dropdown">
{menuItems}
Expand All @@ -31,7 +30,7 @@ const Header = (props) => {
</ul>
</nav>
</header>
)
);
};

export default Header;
10 changes: 5 additions & 5 deletions client/Main.jsx → client/containers/Main.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import { Switch, Route } from 'react-router-dom';
import Recommendations from './recoComponents/Recommendations';
import Charts from './chartComponents/chartsApp';
import Dashboard from './BuildComponents/Dashboard';
import Recommendations from './../views/recommendations/Recommendations';
import Overview from './../views/overview/Overview';
import BuildData from './../views/build-data/BuildData';

class Main extends React.Component {
renderLoader() {
Expand All @@ -18,7 +18,7 @@ class Main extends React.Component {
<Route
exact path="/"
render={() => (
<Charts
<Overview
build={this.props.build}
activeBuild={this.props.activeBuild}
handleCircleClick={this.props.handleCircleClick}
Expand All @@ -30,7 +30,7 @@ class Main extends React.Component {
<Route
path="/builds"
render={() => (
<Dashboard
<BuildData
build={this.props.build}
activeBuild={this.props.activeBuild}
handleIncrement={this.props.handleIncrement}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import React from 'react';

const Panel = (props) => (
const Panel = props => (
<div className="bg">
{props.children}
</div>
);



export default Panel;
export default Panel;
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import React from 'react';


const PanelHeader = (props) => (
const PanelHeader = props => (
<div className="panel-header">
<div className="pull-left panel-title">{props.title}</div>
<div className="pull-right line-height-30">
{props.children}
</div>

</div>
);


export default PanelHeader;
export default PanelHeader;
Empty file added client/containers/utils.js
Empty file.
12 changes: 0 additions & 12 deletions client/recoComponents/Checkbox.jsx

This file was deleted.

24 changes: 0 additions & 24 deletions client/recoComponents/Item.jsx

This file was deleted.

99 changes: 0 additions & 99 deletions client/recoComponents/utils.js

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import Modules from './Modules';
import Assets from './Assets';
import Changes from './Changes';
import Errors from './Errors';
import Cards from './../chartComponents/cards/Cards';
import Modules from './components/Modules';
import Assets from './components/Assets';
import Changes from './components/Changes';
import Errors from './components/Errors';
import Cards from './../cards/Cards';

const Dashboard = (props) => {
const getBytes = (number) => {
Expand Down Expand Up @@ -65,11 +65,34 @@ const Dashboard = (props) => {

return (
<div className="container">
<Cards build={props.build} activeBuild={props.activeBuild} handleIncrement={props.handleIncrement} handleDecrement={props.handleDecrement} />
<Changes build={props.build} activeBuild={props.activeBuild} getBytes={getBytes} dirFinalArray={dirFinalArray} dirFinalArrayPrev={dirFinalArrayPrev} />
<Assets build={props.build} activeBuild={props.activeBuild} getBytes={getBytes} />
<Errors build={props.build} activeBuild={props.activeBuild} />
<Modules build={props.build} activeBuild={props.activeBuild} getBytes={getBytes} dirFinalArray={dirFinalArray} />
<Cards
build={props.build}
activeBuild={props.activeBuild}
handleIncrement={props.handleIncrement}
handleDecrement={props.handleDecrement}
/>
<Changes
build={props.build}
activeBuild={props.activeBuild}
getBytes={getBytes}
dirFinalArray={dirFinalArray}
dirFinalArrayPrev={dirFinalArrayPrev}
/>
<Assets
build={props.build}
activeBuild={props.activeBuild}
getBytes={getBytes}
/>
<Errors
build={props.build}
activeBuild={props.activeBuild}
/>
<Modules
build={props.build}
activeBuild={props.activeBuild}
getBytes={getBytes}
dirFinalArray={dirFinalArray}
/>
</div>
);
};
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,4 @@ const Changes = (props) => {
);
};


export default Changes;
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import React from 'react';
import Panel from './../chartComponents/common/Panel';
import PanelHeader from './../chartComponents/common/PanelHeader';
import { Table, OverlayTrigger, Tooltip } from 'react-bootstrap';
import { Panel as PanelTable } from 'react-bootstrap';
import { Table, OverlayTrigger, Tooltip, Panel as PanelTable } from 'react-bootstrap';

const Errors = (props) => {
let errors = props.build[props.activeBuild].errors;
Expand Down
File renamed without changes.
Empty file.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react';


class Cards extends React.Component {

getData() {
Expand Down
Empty file added client/views/cards/utils.js
Empty file.
Loading

0 comments on commit 370bd68

Please sign in to comment.