{posts[i].date}
- {posts[i].title.toString()}
-{posts[i].intro.toString()}
+continue reading @@ -27,12 +33,22 @@ export default class Preview extends React.Component{ return elements; } - render(){ - const posts = this.props.posts; + render() { + const posts = this.props.app.preview.posts; + const postLimit = this.props.app.postLimit; + const fetched = this.props.app.fetched; + const increasePostLimit = this.props.appActions.increasePostLimit; return (
- {posts.length > 0 ? this.insertPosts(posts): ""}
+ {fetched ?
+
);
}
diff --git a/client/js/components/Sidebar.js b/client/js/components/Sidebar.js
index a0026c2..ce12e27 100644
--- a/client/js/components/Sidebar.js
+++ b/client/js/components/Sidebar.js
@@ -7,9 +7,9 @@ import SensorList from './sensors/SensorList';
import me from '../../assets/images/me.jpg';
import '../../assets/scss/Sidebar.scss';
-export default class Sidebar extends React.Component{
+export default class Sidebar extends React.Component {
- constructor(){
+ constructor() {
super();
this.state = {
@@ -19,7 +19,7 @@ export default class Sidebar extends React.Component{
this.onToggle = this.onToggle.bind(this);
}
- onToggle(){
+ onToggle() {
let temp = this.state.toggler;
temp = temp === "open" ? "" : "open";
@@ -28,8 +28,8 @@ export default class Sidebar extends React.Component{
});
}
- render(){
- return(
+ render() {
+ return (
);
}
diff --git a/client/js/components/sensors/SensorInfo.js b/client/js/components/sensors/SensorInfo.js
new file mode 100644
index 0000000..dcd0f3b
--- /dev/null
+++ b/client/js/components/sensors/SensorInfo.js
@@ -0,0 +1,14 @@
+import React from 'react';
+
+export default class SensorInfo extends React.Component{
+
+ componentDidMount(){
+ this.props.sensorActions.fetchSensorInfoYear('Grand Meadow', '2016');
+ this.props.sensorActions.fetchSensorInfoMonth('Grand Meadow', '2016', 'May');
+ }
+ render(){
+ return(
+
+ {posts.length > 0 ? this.insertPosts(posts): null}
+ {posts.length > postLimit ?
+
+ : null}
+
+ : Test123
+ );
+ }
+}
\ No newline at end of file
diff --git a/client/js/components/sensors/SensorList.js b/client/js/components/sensors/SensorList.js
index f13a7fc..d7b79eb 100644
--- a/client/js/components/sensors/SensorList.js
+++ b/client/js/components/sensors/SensorList.js
@@ -3,41 +3,6 @@ import 'whatwg-fetch';
export default class SensorList extends React.Component {
- constructor(){
- super();
-
- this.state = {
- sensors : {},
- fetching: false,
- fetched: false
- }
- }
-
- componentDidMount(){
- this.loadSensorData();
- }
-
- loadSensorData(){
- this.setState({
- fetching: true
- });
-
- fetch('/api/allsensors')
- .then((response) => {
- return response.json()
- })
- .then((json) => {
- this.setState({
- sensors: json,
- fetching: false,
- fetched: true
- });
- })
- .catch((e) => {
- console.log('Loading sensors failed', e)
- });
- }
-
insertSensorData = (sensor, index) => {
const date = new Date(sensor.updated);
@@ -49,11 +14,12 @@ export default class SensorList extends React.Component {