From 33d9fc9a53defb905f2ad930ef778a46731b0332 Mon Sep 17 00:00:00 2001 From: Niko Hakala Date: Fri, 11 Oct 2019 14:01:30 +0300 Subject: [PATCH] random fixes --- README.md | 1 - package.json | 1 - src/App.css | 8 +++++++- src/Components/Fetchjson.js | 24 ------------------------ src/Components/ModalList.js | 2 -- src/Components/Plants.js | 8 ++++---- 6 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 src/Components/Fetchjson.js diff --git a/README.md b/README.md index 84fc33e..36b87fb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ - ## TODO Plant page layout, what goes where and what info do we actually need in the frontend.
diff --git a/package.json b/package.json index e7c50d7..3b0d867 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "bootstrap": "^4.3.1", "react": "^16.10.2", "react-dom": "^16.10.2", - "react-lightbox-component": "^1.2.1", "react-router-dom": "^5.1.2", "react-scripts": "3.2.0" }, diff --git a/src/App.css b/src/App.css index 54c62a7..d02ea9c 100644 --- a/src/App.css +++ b/src/App.css @@ -40,10 +40,15 @@ text-align: center; border: rgb(0, 0, 0) solid 2px; } + .sys1 h6{ font-size: 25px; } +.sys1 h5{ + font-size: 35px; +} + .App-logo { height: 40vmin; } @@ -73,8 +78,9 @@ } .modal-wrapper{ + width: 50%; display:grid; - grid-column-gap: 0px; + grid-column-gap: 12px; grid-row-gap: 12px; grid-template-columns: 1fr 1fr 1fr 1fr; diff --git a/src/Components/Fetchjson.js b/src/Components/Fetchjson.js deleted file mode 100644 index 06ba847..0000000 --- a/src/Components/Fetchjson.js +++ /dev/null @@ -1,24 +0,0 @@ -import React from 'react'; - -const Fetchjson = () => { - - const fetchPlant = () =>{ - fetch('../plantinfo.json') - .then(r => r.json()) - .then(rData => console.log(rData)) - - } - - - return ( -
- - -
- ); -}; - - -export default Fetchjson; \ No newline at end of file diff --git a/src/Components/ModalList.js b/src/Components/ModalList.js index c092331..b747680 100644 --- a/src/Components/ModalList.js +++ b/src/Components/ModalList.js @@ -18,8 +18,6 @@ const ModalList = () => { ] const handleOpen = (e) => { - e.preventDefault(); - imageList.filter((item, index) => parseInt(e.target.id) !== index) setOpen(true); }; diff --git a/src/Components/Plants.js b/src/Components/Plants.js index dd1a0f3..8849631 100644 --- a/src/Components/Plants.js +++ b/src/Components/Plants.js @@ -30,11 +30,11 @@ const Plants = () => {
-
Nimi: {plant.id}
-
Tyyppi: {plant.type}
-
Istutus päivä: {plant.istutuspv}
+
Nimi: {plant.id}
+
Tyyppi: {plant.type}
+
Istutus päivä: {plant.istutuspv}
Broken - +