Compare commits
No commits in common. "6bdb8b6174be4b620d49b9cc82604927ea8ee28f" and "2dcb19c8ee7d2b4e9ce5757f8864419287151b2b" have entirely different histories.
6bdb8b6174
...
2dcb19c8ee
|
|
@ -22,24 +22,12 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"chartList": [{
|
"chartList": [{
|
||||||
"chartTitle": "Status Plot",
|
|
||||||
"fileName": "data.csv",
|
"fileName": "data.csv",
|
||||||
"chartColumn": "status"
|
"chartColumn": "status"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fileName": "data.csv",
|
"fileName": "data.csv",
|
||||||
"chartColumn": "age"
|
"chartColumn": "age"
|
||||||
}, {
|
|
||||||
"chartTitle": "Another Status Plot",
|
|
||||||
"fileName": "data.csv",
|
|
||||||
"chartColumn": "status"
|
|
||||||
}, {
|
|
||||||
"chartTitle": "Yet Another Status Plot",
|
|
||||||
"fileName": "data.csv",
|
|
||||||
"chartColumn": "status"
|
|
||||||
}, {
|
|
||||||
"fileName": "data.csv",
|
|
||||||
"chartColumn": "status"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"colorMaps": {
|
"colorMaps": {
|
||||||
|
|
|
||||||
12
src/App.css
12
src/App.css
|
|
@ -23,16 +23,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.navbar-item:hover {
|
.navbar-item:hover {
|
||||||
background-color: rgba(10, 10, 10, .1);
|
background-color: #f0f0f0;
|
||||||
color: white;
|
color: #3273dc;
|
||||||
}
|
|
||||||
|
|
||||||
/* body {
|
|
||||||
font-family: BlinkMacSystemFont, -apple-system, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
|
||||||
} */
|
|
||||||
|
|
||||||
a,a:hover {
|
|
||||||
color: white;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes App-logo-spin {
|
@keyframes App-logo-spin {
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,12 @@
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import 'bulma/css/bulma.css';
|
|
||||||
import './App.css';
|
import './App.css';
|
||||||
import RouteMenu from './RouteMenu';
|
import AppRoute from './RouteMenu';
|
||||||
|
|
||||||
class App extends React.Component {
|
class App extends React.Component {
|
||||||
public render() {
|
public render() {
|
||||||
return (
|
return (
|
||||||
<div className="App">
|
<div className="App">
|
||||||
<RouteMenu />
|
<AppRoute />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ export class Chart extends React.Component<any, any> {
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<CardHeaderTitle className='is-centered'>
|
<CardHeaderTitle className='is-centered'>
|
||||||
{this.props.title}
|
{_.capitalize(this.props.chartColumn)}
|
||||||
</CardHeaderTitle>
|
</CardHeaderTitle>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardImage>
|
<CardImage>
|
||||||
|
|
|
||||||
|
|
@ -6,17 +6,12 @@ export default class ChartLoader extends React.Component<any, any> {
|
||||||
public render() {
|
public render() {
|
||||||
const colorMaps = this.props.colorMaps;
|
const colorMaps = this.props.colorMaps;
|
||||||
return (
|
return (
|
||||||
<Columns isCentered={true} isMultiline={true} style={{
|
<Columns isCentered={true}>
|
||||||
backgroundColor:'#f0f0f0'
|
|
||||||
}}>
|
|
||||||
{this.props.chartList.map((o: any, i: number) => {
|
{this.props.chartList.map((o: any, i: number) => {
|
||||||
const colorMap = colorMaps[o.chartColumn];
|
const colorMap = colorMaps[o.chartColumn];
|
||||||
return (
|
return (
|
||||||
<Column key={i} isSize={4}>
|
<Column key={i} isSize={3}>
|
||||||
<Chart
|
<Chart csvFile={o.fileName} chartColumn={o.chartColumn} colorMap={colorMap} />
|
||||||
csvFile={o.fileName} chartColumn={o.chartColumn}
|
|
||||||
colorMap={colorMap} title={o.chartTitle ? o.chartTitle: o.chartColumn}
|
|
||||||
/>
|
|
||||||
</Column>
|
</Column>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ import {
|
||||||
} from 'react-router-dom';
|
} from 'react-router-dom';
|
||||||
import { Container, Navbar, NavbarItem, NavbarMenu, Section } from 'bloomer';
|
import { Container, Navbar, NavbarItem, NavbarMenu, Section } from 'bloomer';
|
||||||
import * as local from 'localforage';
|
import * as local from 'localforage';
|
||||||
|
import 'bulma/css/bulma.css';
|
||||||
import ServerTabLoader from './ServerTabLoader';
|
import ServerTabLoader from './ServerTabLoader';
|
||||||
import ChartLoader from './ChartLoader';
|
import ChartLoader from './ChartLoader';
|
||||||
|
|
||||||
|
|
@ -15,7 +16,7 @@ const navButton = (name: string, link: string) => (
|
||||||
|
|
||||||
const RedirectCharts = () => (<Redirect to='/charts' />);
|
const RedirectCharts = () => (<Redirect to='/charts' />);
|
||||||
|
|
||||||
class RouteMenu extends React.Component {
|
class AppRoute extends React.Component {
|
||||||
constructor(props: any) {
|
constructor(props: any) {
|
||||||
super(props);
|
super(props);
|
||||||
this.state = {
|
this.state = {
|
||||||
|
|
@ -44,7 +45,7 @@ class RouteMenu extends React.Component {
|
||||||
<Router>
|
<Router>
|
||||||
<div>
|
<div>
|
||||||
<Container isFluid={true} isMarginless={true} isFullWidth={true}>
|
<Container isFluid={true} isMarginless={true} isFullWidth={true}>
|
||||||
<Navbar style={{ backgroundColor:'#00D1B2' }}>
|
<Navbar style={{ border: 'solid 1px #00D1B2', margin: '0' }}>
|
||||||
<NavbarMenu isActive={true}>
|
<NavbarMenu isActive={true}>
|
||||||
<NavbarItem >{navButton('Charts', '/charts')}</NavbarItem>
|
<NavbarItem >{navButton('Charts', '/charts')}</NavbarItem>
|
||||||
<NavbarItem>{navButton('Tables', '/tables')}</NavbarItem>
|
<NavbarItem>{navButton('Tables', '/tables')}</NavbarItem>
|
||||||
|
|
@ -61,4 +62,4 @@ class RouteMenu extends React.Component {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
export default RouteMenu
|
export default AppRoute
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue