tvolkmann/smart_garden_server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge conflict.

Browse Source
This commit is contained in:
Andrés Uribe Stengel 2020-07-16 13:50:10 +02:00
commit 0662649faf
4 changed files with 60 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/main.jsx
View File

@ -29,7 +29,5 @@ Meteor.startup(() => {
Meteor.subscribe('activeDeviceCollection'); Meteor.subscribe('activeDeviceCollection');
} }
Meteor.setTimeout(function() {
ReactDOM.render(<App />, document.getElementById('root')); ReactDOM.render(<App />, document.getElementById('root'));
}, 1250);
}); });

18
imports/ui/Home.jsx
View File

@ -3,6 +3,7 @@ import {CartesianGrid, Legend, Line, LineChart, ResponsiveContainer, Tooltip, XA
import SensorCardDeck from './SensorCardDeck' import SensorCardDeck from './SensorCardDeck'
import {SensorDataCollection, ActiveDeviceCollection} from "../../client/main"; import {SensorDataCollection, ActiveDeviceCollection} from "../../client/main";
import {useTracker} from 'meteor/react-meteor-data'; import {useTracker} from 'meteor/react-meteor-data';
import {Col, Form, Row} from "react-bootstrap"; import {Col, Form, Row} from "react-bootstrap";
export default function Home() { export default function Home() {
@ -28,13 +29,25 @@ export default function Home() {
} }
} }
if (sensorData.length <= 0) {
return (
<CardDeck>
<Card>
<Card.Body>
<Card.Title>Loading!</Card.Title>
<Card.Text>Please wait...</Card.Text>
</Card.Body>
</Card>
</CardDeck>
)
} else {
return ( return (
<> <>
<Row> <Row>
<Col xs lg="2"> <Col xs lg="2">
<h4>Devices:</h4> <h4>Devices:</h4>
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col xs lg="2"> <Col xs lg="2">
@ -55,7 +68,6 @@ export default function Home() {
</Row> </Row>
<SensorCardDeck/> <SensorCardDeck/>
<Row> <Row>
<Col> <Col>
<ResponsiveContainer width='100%' height={350}> <ResponsiveContainer width='100%' height={350}>
@ -109,5 +121,5 @@ export default function Home() {
</Col> </Col>
</Row> </Row>
</> </>
) )}
} }

14
imports/ui/SensorCardDeck.jsx
View File

@ -11,7 +11,18 @@ export default function SensorCardDeck() {
const sensorData = useTracker(() => { const sensorData = useTracker(() => {
return SensorDataCollection.find({ device_id: deviceName.deviceName }, { sort: { timestamp: -1 }, limit: 1 }).fetch(); return SensorDataCollection.find({ device_id: deviceName.deviceName }, { sort: { timestamp: -1 }, limit: 1 }).fetch();
}); });
if (sensorData.length <= 0) {
return (
<CardDeck>
<Card>
<Card.Body>
<Card.Title>Loading!</Card.Title>
<Card.Text>Please wait...</Card.Text>
</Card.Body>
</Card>
</CardDeck>
)
} else {
return ( return (
<CardDeck> <CardDeck>
<Card> <Card>
@ -41,3 +52,4 @@ export default function SensorCardDeck() {
</CardDeck> </CardDeck>
) )
} }
}

3
package.json
View File

@ -2,7 +2,8 @@
"name": "smart_garden_server", "name": "smart_garden_server",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "meteor run", "start": "MONGO_URL=mongodb://garden:99009911@cloud.timovolkmann.de:27017/Smart_Garden meteor run",
"plainstart": "meteor run",
"test": "meteor test --once --driver-package meteortesting:mocha", "test": "meteor test --once --driver-package meteortesting:mocha",
"test-app": "TEST_WATCH=1 meteor test --full-app --driver-package meteortesting:mocha", "test-app": "TEST_WATCH=1 meteor test --full-app --driver-package meteortesting:mocha",
"visualize": "meteor --production --extra-packages bundle-visualizer" "visualize": "meteor --production --extra-packages bundle-visualizer"