Merge remote-tracking branch 'origin/dev' into dev

src/Pages/Home.js

@@ -162,13 +162,24 @@ class Home extends Component {
 		const { device, range, breakdown } = selectedFeed;
 		const { device, range, breakdown } = selectedFeed;
 		this.getFeedData(device, range, breakdown);
 		this.getFeedData(device, range, breakdown);
 	};
 	};
+
 	getMax(){
 	getMax(){
 
 
 	}
 	}
+
 	getMin(){
 	getMin(){
 		
 		
 	}
 	}
+
 	getAvg(){
 	getAvg(){
+
+	}
+
+	getTotal(){
+		
+	}
+
+	getLast(){
 		
 		
 	}
 	}
 
 
@@ -197,7 +208,7 @@ class Home extends Component {
 						{/* {Data.map((item, index) => (
 						{/* {Data.map((item, index) => (
 							<DataCard key={index} item={item} feedData={feedData} />
 							<DataCard key={index} item={item} feedData={feedData} />
 						))} */}
 						))} */}
-						<DataCard item={Data[0]} feedData={currentFeed} total={}/>
+						<DataCard item={Data[0]} feedData={currentFeed} total={currentLast}/>
 						<DataCard item={Data[1]} feedData={revenueFeed} total={revenueTotal} max={revenueMax} min={revenueMin} avg={revenueAvg}/>
 						<DataCard item={Data[1]} feedData={revenueFeed} total={revenueTotal} max={revenueMax} min={revenueMin} avg={revenueAvg}/>
 						<DataCard item={Data[2]} feedData={peopleFeed} total={peopleTotal} max={peopleMax} min={peopleMin} avg={peopleAvg}/>
 						<DataCard item={Data[2]} feedData={peopleFeed} total={peopleTotal} max={peopleMax} min={peopleMin} avg={peopleAvg}/>
 						<DataCard item={Data[3]} feedData={remoteFeed} total={remoteTotal} max={remoteMax} min={remoteMin} avg={remoteAvg}/>
 						<DataCard item={Data[3]} feedData={remoteFeed} total={remoteTotal} max={remoteMax} min={remoteMin} avg={remoteAvg}/>