diff --git a/src/Components/LogParser.js b/src/Components/LogParser.js
index 4f7a746..8afd839 100644
--- a/src/Components/LogParser.js
+++ b/src/Components/LogParser.js
@@ -2,26 +2,44 @@ import React, { useState, useEffect } from 'react';
const LogParser = () => {
- const [logs, setLogs] = useState([]);
-
+ const [sensor, setSensor] = useState([]);
+ const [systemfile, setSystemfile] = useState([]);
+ const [jsoncheck, setJsoncheck] = useState([]);
useEffect(() => {
- fetchLogs();
+ fetchSensor();
+ fetchSystemfile();
+ fetchJsoncheck();
}, [])
- const fetchLogs = () => {
+ const fetchSensor = () => {
fetch('../tinyforest.log.json')
.then((res) => res.json())
- .then(data => setLogs(data))
+ .then(data => setSensor(data.sensor.msg))
+ .catch(err => console.error(err))
+ }
+ const fetchSystemfile = () => {
+ fetch('../tinyforest.log.json')
+ .then((res) => res.json())
+ .then(data => setSystemfile(data.system_file.msg))
+ .catch(err => console.error(err))
+ }
+ const fetchJsoncheck = () => {
+ fetch('../tinyforest.log.json')
+ .then((res) => res.json())
+ .then(data => setJsoncheck(data.json_check.msg))
.catch(err => console.error(err))
}
- console.log(log)
+ console.log(sensor)
+ console.log(jsoncheck)
+ console.log(systemfile)
return (
-
+
{sensor.name}: {sensor.description}
+
{jsoncheck.description}
);
};
diff --git a/src/Components/Plants.js b/src/Components/Plants.js
index c310372..d05233e 100644
--- a/src/Components/Plants.js
+++ b/src/Components/Plants.js
@@ -1,6 +1,5 @@
import React, {useState, useEffect} from 'react';
-
const Plants = () => {
// TODO Figure out layout and what information to pull form json
@@ -8,9 +7,11 @@ const Plants = () => {
// plantinfo.json is a temporary file
const [plant, setPlant] = useState([]);
+ const [teksti, setTeksti] = useState('');
useEffect(() => {
jsonFetch();
+ txtFetch();
}, [])
const jsonFetch = () => {
@@ -20,7 +21,15 @@ const Plants = () => {
.catch(err => console.error(err))
}
-
+ const txtFetch = () => {
+ fetch('../tekstia.txt')
+ .then((res) => res.text())
+ .then(data => setTeksti(data))
+ .catch(err => console.error(err))
+ }
+
+
+ console.log(teksti)
//console.log(plant.imagefile)
@@ -42,7 +51,7 @@ const Plants = () => {
Tyyppi: Kasvi2Tyyppi
Istutuspäivä: kasvi2ispv
-