cleanup

jckr · Aug 17, 2016 · 2990418 · 2990418
1 parent b1a9519
commit 2990418
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 23 deletions.
diff --git a/src/App.js b/src/App.js
@@ -103,10 +103,10 @@ class App extends Component {
           }}
         >
           <SmallChart
-          highlighted={highlighted}
-          highlightX={this.highlightX}
-          series={data.Pressure}
-          title='Pressure'
+            highlighted={highlighted}
+            highlightX={this.highlightX}
+            series={data.Pressure}
+            title='Pressure'
           />
           <SmallChart
             highlighted={highlighted}

diff --git a/src/large-chart.js b/src/large-chart.js
@@ -16,13 +16,11 @@ const DAY_IN_MS = 24 * HOUR_IN_MS;
 
 const FlexibleXYPlot = makeWidthFlexible(XYPlot);
 
-// import * as CONSTANTS from './constants.js'; 
-
 export default class LargeChart extends Component {
   render() {
   	const {highlighted, highlightX, series} = this.props;
-  	const minValue = series.reduce((prev, curr) => Math.min(prev, curr.y), Infinity);
-  	const maxValue = series.reduce((prev, curr) => Math.max(prev, curr.y), -Infinity);
+  	const minValue = Math.min(...series.map(d => d.y));
+  	const maxValue = Math.max(...series.map(d => d.y));
 
   	const yDomain = [0.98 * minValue, 1.02 * maxValue];
   	const tickValues = series.map(d => d.x);
@@ -60,24 +58,24 @@ export default class LargeChart extends Component {
     		stroke='#11939a'
     		strokeWidth={2}
     	/>
-    	{highlighted === undefined ? null : 
+    	{highlighted ? 
     		<LineSeries
     			data={[
     				{x: highlighted && highlighted.x, y: yDomain[0]},
     				{x: highlighted && highlighted.x, y: yDomain[1]}
     			]}
     			stroke='rgba(17,147,154,0.7)'
     			strokeWidth={2}
-    		/>
+    		/> : null
     	}
-      {highlighted === undefined ? null : 
+      {highlighted ?  
         <MarkSeries
           data={[{
             x: highlighted && highlighted.x,
             y: highlighted && series[highlighted.i].y
           }]}
           color='rgba(17,147,154,0.7)'
-        />
+        /> : null
       }
     	<XAxis 
     		tickSize={4}

diff --git a/src/logo.svg b/src/logo.svg
diff --git a/src/secrets.json b/src/secrets.json
@@ -1,3 +1,3 @@
 {
-	"API": "ENTER YOUR OPENWEATHERMAP API HERE"
+	"API": "ENTER YOUR API KEY HERE"
 }
diff --git a/src/small-chart.js b/src/small-chart.js
@@ -20,9 +20,9 @@ export default class SmallChart extends Component {
     if (!series) {
       return <div />;
     }
-    const minValue = series.reduce((prev, curr) => Math.min(prev, curr.y), Infinity);
-    const maxValue = series.reduce((prev, curr) => Math.max(prev, curr.y), -Infinity);
-
+    const minValue = Math.min(...series.map(d => d.y));
+    const maxValue = Math.max(...series.map(d => d.y));
+    
     const yDomain = [0.98 * minValue, 1.02 * maxValue];
     const labelValues = makeLabelValues(series);