diff --git a/src/App.tsx b/src/App.tsx index 29863ce..4de23f5 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -6,7 +6,7 @@ class App extends React.Component { public render() { return (
- +
); } diff --git a/src/Chart.tsx b/src/Chart.tsx index 0879e12..99be8fd 100644 --- a/src/Chart.tsx +++ b/src/Chart.tsx @@ -32,16 +32,28 @@ export class Chart extends React.Component { const countMap = _.countBy(data, (o: any) => _.get(o, this.props.chartColumn)) const chartData = _.map(_.keys(countMap), (k: any) => { return { - name: this.props.chartColumn + ' ' + k, + name: k, value: countMap[k], } }) + const RADIAN = Math.PI / 180; + const renderCustomizedLabel = ({ cx, cy, midAngle, innerRadius, outerRadius, percent, index }:any) => { + const radius = innerRadius + (outerRadius - innerRadius) * 0.5; + const x = cx + radius * Math.cos(-midAngle * RADIAN); + const y = cy + radius * Math.sin(-midAngle * RADIAN); + + return ( + + {chartData[index].name} + + ); + }; return ( Plotting {_.capitalize(this.props.chartColumn)} - + { chartData.map((_0, _1) => ) } diff --git a/src/RouteMenu.tsx b/src/RouteMenu.tsx index 534b39d..49c3bef 100644 --- a/src/RouteMenu.tsx +++ b/src/RouteMenu.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { BrowserRouter as Router, - Route, + Route, Redirect, Link } from 'react-router-dom'; import { Container, Navbar, NavbarItem, NavbarMenu, Section } from 'bloomer'; @@ -9,23 +9,26 @@ import 'bulma/css/bulma.css'; import ServerTabLoader from './ServerTabLoader'; import ChartLoader from './ChartLoader'; -const navButton = (name:string,link:string) => ( +const navButton = (name: string, link: string) => ( {name} ); +const RedirectCharts = () => (); + const AppRoute = () => (
- {navButton('Charts','/')} - {navButton('Tables','/tables')} + {navButton('Charts', '/charts')} + {navButton('Tables', '/tables')}
- + +