showing new image on webapp

Cameronek · Mar 23, 2024 · cfe3a3b · cfe3a3b
1 parent ed3e989
commit cfe3a3b
Show file tree

Hide file tree

Showing 32 changed files with 56 additions and 18 deletions.
diff --git a/camera.py b/camera.py
@@ -0,0 +1,16 @@
+from picamera2 import Picamera2
+from time import sleep
+
+
+def take_picture(delay):
+    camera = Picamera2()
+    while True:
+        camera.start()
+        camera.capture_file("/home/pi/Desktop/PyFarm_Capstone/PyeFarm/PyeFarmProject/frontend/static/images/test.jpg")
+        camera.stop()
+        sleep(delay)
+
+
+
+if __name__ == "__main__":
+    take_picture(10)
diff --git a/frontend/src/components/CameraViewPage.js b/frontend/src/components/CameraViewPage.js
@@ -13,7 +13,7 @@ import FormcontrolLabel from "@mui/material/FormControlLabel";
 import HomeIcon from "@mui/icons-material/HomeRounded";
 import CameraIcon from "@mui/icons-material/CameraAltRounded";
 
-import Greenhouse from "../../static/images/greenhouse.jpg";
+import Greenhouse from "../../static/images/test.jpg";
 
 export default class CameraViewPage extends Component{
     constructor(props){

diff --git a/frontend/src/components/PlantPage.js b/frontend/src/components/PlantPage.js
@@ -15,6 +15,7 @@ import CameraIcon from "@mui/icons-material/CameraAltRounded";
 import PlantIcon from "@mui/icons-material/ParkRounded";
 //import '../../static/css/index.css';s
 
+
 // Global vars
 let cameraHref = (window.location.href).concat("/cameraview");
 
@@ -24,7 +25,22 @@ export default class PlantPage extends Component{
     }
 
     render() {
+	var current_soil_temp;
+	var current_soil_moisture;
+
         return (
+	<script src="SearchPage.js"></script>,
+	$(document).ready(function(){
+		console.log(response_array);
+		var num_data_entries = response_array.length;
+		current_soil_temp = response_array[num_data_entries - 1].soil_temp;
+		current_soil_moisture = response_array[num_data_entries - 1].soil_moisture;
+		console.log("current soil temp: " + current_soil_temp);
+		console.log("current soil moisture: " + current_soil_moisture);
+		$('#cur_soil_temp').text(current_soil_temp);
+		$('#cur_soil_moisture').text(current_soil_moisture);
+		}),
+
           <body style={{margin: "0", padding: 0, backgroundColor:"white", height:"100vh", width:"100vw", position:"relative"}}>
             {/* Solid Rectangle at top of page*/}
             <div style={{display: "inline-block", width:"100vw", height:"3vh", background:"#68AC67", align:"center" }}></div>
@@ -128,15 +144,15 @@ export default class PlantPage extends Component{
                 <p style={{width:"4vw"}}>&nbsp;</p>
               </Grid>
               <Grid item xs={false} align ="left">
-                <Button disabled="true" style={{width:"20vw", height:"25vh",backgroundColor: '#A3BD8B',  border: "3px solid black", borderRadius:"5px"}}>
+                <Button id="cur_soil_temp" disabled="true" style={{width:"20vw", height:"25vh",backgroundColor: '#A3BD8B',  border: "3px solid black", borderRadius:"5px"}}>
                   <b style={{width:"20vw", color:"black", font:"Oxygen", fontSize:20}}> °C <br /> <br />  <div style={{ borderTop: "2px solid #000000 ", marginLeft: 0, marginRight: 0 }}></div> <br />  tempVar </b>
                 </Button>
               </Grid>
               <Grid item xs={false} align ="left">
                 <p style={{width:"4vw"}}>&nbsp;</p>
               </Grid>
               <Grid item xs={false} align ="left">
-                <Button disabled="true" style={{width:"20vw", height:"25vh",backgroundColor: '#85B658',  border: "3px solid black", borderRadius:"5px"}}>
+                <Button id="cur_soil_moisture" disabled="true" style={{width:"20vw", height:"25vh",backgroundColor: '#85B658',  border: "3px solid black", borderRadius:"5px"}}>
                   <b style={{width:"20vw", color:"black", font:"Oxygen", fontSize:20}}> % <br /> <br /> <div style={{ borderTop: "2px solid #000000 ", marginLeft: 0, marginRight: 0 }}></div> <br />  moistVar </b>
                 </Button>
               </Grid>

diff --git a/frontend/src/components/SearchPage.js b/frontend/src/components/SearchPage.js
@@ -9,11 +9,14 @@ import {SelectComponent} from './SelectComponent';
 
 // temporary import
 import tempPlant from "../../static/images/plant.png"
-import Greenhouse from "../../static/images/greenhouse.jpg";
+import Greenhouse from "../../static/images/test.jpg";
 
 // temporary camera page link
 let cameraHref = (window.location.href).concat("/plant/cameraview");
 
+//global variable for response data
+var response_array;
+
 export default class SearchPage extends Component{
     constructor(props){
         super(props);
@@ -50,8 +53,10 @@ export default class SearchPage extends Component{
 			current_air_humid = response[num_data_entries - 1].air_humid
 			console.log("current air temp: " + current_air_temp);		
 			console.log("current air humidity: " + current_air_humid);
-			$('#cur_temp').text(current_air_temp);	
-			$('#cur_humid').text(current_air_humid);
+			$('#cur_temp').text(current_air_temp + " " + "°C");	
+			$('#cur_humid').text(current_air_humid + " " + "%");
+			response_array = response;
+			console.log(response_array)
 				}
 
 			});
@@ -146,7 +151,7 @@ export default class SearchPage extends Component{
                     <p style={{width:"3vw"}}>&nbsp;</p>
                   </Grid>
                   <Grid item xs={false} align ="left">
-                    <Button id = "cur_temp" disabled="true" style={{width:"20vw", backgroundColor: '#67AE66',  border: "3px solid black", borderRadius:"5px"}}>
+                    <Button id = "cur_temp" disabled="true" style={{width:"20vw", backgroundColor: '#67AE66',  border: "3px solid black", borderRadius:"5px", color:"black"}}>
                       <b style={{width:"19vw", color:"black", font:"Oxygen", fontSize:20}}></b>
                     </Button>
                   </Grid>
@@ -183,7 +188,7 @@ export default class SearchPage extends Component{
                     <p style={{width:"3vw"}}>&nbsp;</p>
                   </Grid>
                   <Grid item xs={false} align ="left">
-                    <Button id = "cur_humid" disabled="true" style={{width:"20vw", backgroundColor: '#85B658',  border: "3px solid black", borderRadius:"5px"}}>
+                    <Button id = "cur_humid" disabled="true" style={{width:"20vw", backgroundColor: '#85B658',  border: "3px solid black", borderRadius:"5px", color:"black"}}>
                       <b style={{width:"19vw", color:"black", font:"Oxygen", fontSize:20}}></b>
                     </Button>
                   </Grid>

diff --git a/frontend/static/frontend/0a2bd6f0b47c5541c589eddb210f14b7.jpg b/frontend/static/frontend/0a2bd6f0b47c5541c589eddb210f14b7.jpg
diff --git a/frontend/static/frontend/117937b584288494ac4969960e2ec54a.jpg b/frontend/static/frontend/117937b584288494ac4969960e2ec54a.jpg
diff --git a/frontend/static/frontend/1a84aa0bf1878fbca29431e71efae89c.jpg b/frontend/static/frontend/1a84aa0bf1878fbca29431e71efae89c.jpg
diff --git a/frontend/static/frontend/1f0583daf8d96a5be34efc4017e26902.jpg b/frontend/static/frontend/1f0583daf8d96a5be34efc4017e26902.jpg
diff --git a/frontend/static/frontend/282c24ace7ff1af859d70d530776db38.jpg b/frontend/static/frontend/282c24ace7ff1af859d70d530776db38.jpg
diff --git a/frontend/static/frontend/28794e3c1c157514e2bb66e386543887.jpg b/frontend/static/frontend/28794e3c1c157514e2bb66e386543887.jpg
diff --git a/frontend/static/frontend/2b909622c1ce4dbaaee5e44a19559a21.jpg b/frontend/static/frontend/2b909622c1ce4dbaaee5e44a19559a21.jpg
diff --git a/frontend/static/frontend/36efc6c75100b18268f32fa6ee17f4e1.jpg b/frontend/static/frontend/36efc6c75100b18268f32fa6ee17f4e1.jpg
diff --git a/frontend/static/frontend/3f0a237250eb7873824c0f951046baa3.jpg b/frontend/static/frontend/3f0a237250eb7873824c0f951046baa3.jpg
diff --git a/frontend/static/frontend/48ac448f4a6fbc571f7f14fe320b558b.jpg b/frontend/static/frontend/48ac448f4a6fbc571f7f14fe320b558b.jpg
diff --git a/frontend/static/frontend/500b1971b0b0903c81543c9757359bd5.jpg b/frontend/static/frontend/500b1971b0b0903c81543c9757359bd5.jpg
diff --git a/frontend/static/frontend/6b4a168992e06ce1d511930fae2435f4.jpg b/frontend/static/frontend/6b4a168992e06ce1d511930fae2435f4.jpg
diff --git a/frontend/static/frontend/713442d4d5a395f7df1bad5bf0ff2ae0.jpg b/frontend/static/frontend/713442d4d5a395f7df1bad5bf0ff2ae0.jpg
diff --git a/frontend/static/frontend/765030bf4368819bac056cdf9d486b76.jpg b/frontend/static/frontend/765030bf4368819bac056cdf9d486b76.jpg
diff --git a/frontend/static/frontend/7e3a01abd3278befa74c6567ec91975a.jpg b/frontend/static/frontend/7e3a01abd3278befa74c6567ec91975a.jpg
diff --git a/frontend/static/frontend/81346f6a5ccf9f119d930b3d9570af9e.jpg b/frontend/static/frontend/81346f6a5ccf9f119d930b3d9570af9e.jpg
diff --git a/frontend/static/frontend/9d62c8f1324ec731d6bc816fbfe602f8.jpg b/frontend/static/frontend/9d62c8f1324ec731d6bc816fbfe602f8.jpg
diff --git a/frontend/static/frontend/c9cb203ccc6b8fea6b046775dd18666e.jpg b/frontend/static/frontend/c9cb203ccc6b8fea6b046775dd18666e.jpg
diff --git a/frontend/static/frontend/d3ae9c90c9c002d45c1d3d1459ab09be.jpg b/frontend/static/frontend/d3ae9c90c9c002d45c1d3d1459ab09be.jpg
diff --git a/frontend/static/frontend/d7cd1fad68aff7a836e2bcd016544391.jpg b/frontend/static/frontend/d7cd1fad68aff7a836e2bcd016544391.jpg
diff --git a/frontend/static/frontend/d950aa7a19e22c41caf5c57e4f1f770b.jpg b/frontend/static/frontend/d950aa7a19e22c41caf5c57e4f1f770b.jpg
diff --git a/frontend/static/frontend/db14112343dd37b7ee9530232b984223.jpg b/frontend/static/frontend/db14112343dd37b7ee9530232b984223.jpg
diff --git a/frontend/static/frontend/f03b1283fdc888a8ac21a02753f80e68.jpg b/frontend/static/frontend/f03b1283fdc888a8ac21a02753f80e68.jpg
diff --git a/frontend/static/frontend/main.js b/frontend/static/frontend/main.js
diff --git a/frontend/static/frontend/main.js.LICENSE.txt b/frontend/static/frontend/main.js.LICENSE.txt
@@ -6,6 +6,10 @@
   !*** ./src/components/App.js ***!
   \*******************************/
 
+/*!********************************!*\
+  !*** ./static/images/test.jpg ***!
+  \********************************/
+
 /*!*********************************!*\
   !*** ./static/images/plant.png ***!
   \*********************************/
@@ -26,10 +30,6 @@
   !*** ./src/components/SearchPage.js ***!
   \**************************************/
 
-/*!**************************************!*\
-  !*** ./static/images/greenhouse.jpg ***!
-  \**************************************/
-
 /*!****************************************!*\
   !*** ./node_modules/react-is/index.js ***!
   \****************************************/

diff --git a/frontend/static/images/test.jpg b/frontend/static/images/test.jpg
diff --git a/frontend/templates/frontend/index.html b/frontend/templates/frontend/index.html
@@ -22,6 +22,7 @@
         </div>
 
         <script src ="{% static "frontend/main.js" %}"></script>	
-	<!--<script src ="{% static "frontend/src/components/SearchPage.js" %}"></script>-->		
+	<script src ="{% static "frontend/src/components/SearchPage.js" %}"></script>	
+	<script src ="{% static "frontend/src/components/PlantPage.js" %}"></script>
     </body>
 </html>
diff --git a/manage.py b/manage.py
@@ -5,7 +5,6 @@
 import serial_test
 from threading import Thread
 
-
 def main():
     """Run administrative tasks."""
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'PyeFarmProject.settings')
@@ -21,7 +20,8 @@ def main():
 
 
 if __name__ == '__main__':
-    serial_comm_thread = Thread(target = serial_test.serial_comm, args = ())
-    serial_comm_thread.start()
+    #serial_comm_thread = Thread(target = serial_test.serial_comm, args = ())
+    #serial_comm_thread.start()
+
     main()
-    serial_comm_thread.join()
+    #serial_comm_thread.join()