Compare commits
3 Commits
2dcb19c8ee
...
6bdb8b6174
| Author | SHA1 | Date |
|---|---|---|
|
|
6bdb8b6174 | |
|
|
97e628c4e1 | |
|
|
b02c090d03 |
|
|
@ -22,12 +22,24 @@
|
|||
}
|
||||
],
|
||||
"chartList": [{
|
||||
"chartTitle": "Status Plot",
|
||||
"fileName": "data.csv",
|
||||
"chartColumn": "status"
|
||||
},
|
||||
{
|
||||
"fileName": "data.csv",
|
||||
"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": {
|
||||
|
|
|
|||
12
src/App.css
12
src/App.css
|
|
@ -23,8 +23,16 @@
|
|||
}
|
||||
|
||||
.navbar-item:hover {
|
||||
background-color: #f0f0f0;
|
||||
color: #3273dc;
|
||||
background-color: rgba(10, 10, 10, .1);
|
||||
color: white;
|
||||
}
|
||||
|
||||
/* 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 {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
import * as React from 'react';
|
||||
import 'bulma/css/bulma.css';
|
||||
import './App.css';
|
||||
import AppRoute from './RouteMenu';
|
||||
import RouteMenu from './RouteMenu';
|
||||
|
||||
class App extends React.Component {
|
||||
public render() {
|
||||
return (
|
||||
<div className="App">
|
||||
<AppRoute />
|
||||
<RouteMenu />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ export class Chart extends React.Component<any, any> {
|
|||
<Card>
|
||||
<CardHeader>
|
||||
<CardHeaderTitle className='is-centered'>
|
||||
{_.capitalize(this.props.chartColumn)}
|
||||
{this.props.title}
|
||||
</CardHeaderTitle>
|
||||
</CardHeader>
|
||||
<CardImage>
|
||||
|
|
|
|||
|
|
@ -6,12 +6,17 @@ export default class ChartLoader extends React.Component<any, any> {
|
|||
public render() {
|
||||
const colorMaps = this.props.colorMaps;
|
||||
return (
|
||||
<Columns isCentered={true}>
|
||||
<Columns isCentered={true} isMultiline={true} style={{
|
||||
backgroundColor:'#f0f0f0'
|
||||
}}>
|
||||
{this.props.chartList.map((o: any, i: number) => {
|
||||
const colorMap = colorMaps[o.chartColumn];
|
||||
return (
|
||||
<Column key={i} isSize={3}>
|
||||
<Chart csvFile={o.fileName} chartColumn={o.chartColumn} colorMap={colorMap} />
|
||||
<Column key={i} isSize={4}>
|
||||
<Chart
|
||||
csvFile={o.fileName} chartColumn={o.chartColumn}
|
||||
colorMap={colorMap} title={o.chartTitle ? o.chartTitle: o.chartColumn}
|
||||
/>
|
||||
</Column>
|
||||
);
|
||||
})}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import {
|
|||
} from 'react-router-dom';
|
||||
import { Container, Navbar, NavbarItem, NavbarMenu, Section } from 'bloomer';
|
||||
import * as local from 'localforage';
|
||||
import 'bulma/css/bulma.css';
|
||||
import ServerTabLoader from './ServerTabLoader';
|
||||
import ChartLoader from './ChartLoader';
|
||||
|
||||
|
|
@ -16,7 +15,7 @@ const navButton = (name: string, link: string) => (
|
|||
|
||||
const RedirectCharts = () => (<Redirect to='/charts' />);
|
||||
|
||||
class AppRoute extends React.Component {
|
||||
class RouteMenu extends React.Component {
|
||||
constructor(props: any) {
|
||||
super(props);
|
||||
this.state = {
|
||||
|
|
@ -45,7 +44,7 @@ class AppRoute extends React.Component {
|
|||
<Router>
|
||||
<div>
|
||||
<Container isFluid={true} isMarginless={true} isFullWidth={true}>
|
||||
<Navbar style={{ border: 'solid 1px #00D1B2', margin: '0' }}>
|
||||
<Navbar style={{ backgroundColor:'#00D1B2' }}>
|
||||
<NavbarMenu isActive={true}>
|
||||
<NavbarItem >{navButton('Charts', '/charts')}</NavbarItem>
|
||||
<NavbarItem>{navButton('Tables', '/tables')}</NavbarItem>
|
||||
|
|
@ -62,4 +61,4 @@ class AppRoute extends React.Component {
|
|||
);
|
||||
}
|
||||
}
|
||||
export default AppRoute
|
||||
export default RouteMenu
|
||||
|
|
|
|||
Loading…
Reference in New Issue