From 9e2bf3dced51f700c61d2febd846d575bf5682ba Mon Sep 17 00:00:00 2001 From: mgerb42 Date: Mon, 19 Dec 2016 05:21:45 +0100 Subject: [PATCH] fixed chart --- client/js/components/sensors/SensorInfo.js | 11 +- client/js/components/sensors/SensorInfo.scss | 4 +- client/js/components/sensors/chartOptions.js | 8 +- stats.html | 189 +++++++++++++++++++ 4 files changed, 198 insertions(+), 14 deletions(-) create mode 100644 stats.html diff --git a/client/js/components/sensors/SensorInfo.js b/client/js/components/sensors/SensorInfo.js index 1ae3dab..e88a685 100644 --- a/client/js/components/sensors/SensorInfo.js +++ b/client/js/components/sensors/SensorInfo.js @@ -2,20 +2,15 @@ import React from 'react'; import {Link} from 'react-router'; import Loading from '../utils/Loading'; -import _chartjs from 'chart.js'; import Chart from 'react-chartjs'; -import { - ChartOptions, - DataTemplate -} -from './chartOptions'; +import { ChartOptions, DataTemplate } from './chartOptions'; import './SensorInfo.scss'; const LineChart = Chart.Line; export default class SensorInfo extends React.Component { - + componentWillMount() { let location = this.props.params.location; this.props.sensorActions.fetchUniqueDates(location); @@ -74,7 +69,7 @@ export default class SensorInfo extends React.Component { temp.datasets[0].data.push(d.maxtemp); temp.datasets[1].data.push(d.mintemp); } - + return temp; } diff --git a/client/js/components/sensors/SensorInfo.scss b/client/js/components/sensors/SensorInfo.scss index 723e1c1..0fc6939 100644 --- a/client/js/components/sensors/SensorInfo.scss +++ b/client/js/components/sensors/SensorInfo.scss @@ -1,11 +1,11 @@ .SensorInfo{ - flex: 1; padding-right: 1em; padding-left: 1em; - min-width: 0; + .selector-row{ display: flex; justify-content: center; + select{ margin-left: 5px; } diff --git a/client/js/components/sensors/chartOptions.js b/client/js/components/sensors/chartOptions.js index f2bac62..c7acb8b 100644 --- a/client/js/components/sensors/chartOptions.js +++ b/client/js/components/sensors/chartOptions.js @@ -1,9 +1,9 @@ export const ChartOptions = { responsive: true, - // scaleOverride: true, - //scaleSteps: 20, - // scaleStartValue: 0, - //scaleStepWidth: 5 + scaleOverride: true, + scaleStartValue: -10, + scaleSteps: 11, + scaleStepWidth: 10, }; export let DataTemplate = { diff --git a/stats.html b/stats.html new file mode 100644 index 0000000..a6dcc87 --- /dev/null +++ b/stats.html @@ -0,0 +1,189 @@ + + Webpack Visualizer + +
+ + + \ No newline at end of file