Updated Layout

app.py

@@ -1,27 +1,56 @@
 # main.py
 import streamlit as st
 import authentication 
+from authentication import greeting
 import streamlit as st
-from pag import add_field, edit, monitor
+from pag import add_field, edit, monitor,contact_form
+st. set_page_config(layout="wide")
 
 
 def authenticate_user():
-    st.title("Welcome to :orange[Field Monitoring App]")
     st.markdown("""
             <style>
             .stSelectbox > div > div {cursor: pointer;}
             </style>
             """, unsafe_allow_html=True)
     if not st.session_state.authenticated:
-        choice = st.selectbox("Interested? Sign up or log in if you have an account",options=["Home","Login","SignUp"])
+        st.title("Welcome to :orange[Field Monitoring App]")
+        row1_col1, row1_col2 = st.columns([2, 1])
 
-        if choice == "Home":
-          st.write("App Description")
+        with row1_col1:
+            choice = st.selectbox("Interested? Sign up or log in if you have an account",options=["Login","SignUp","Contact Us"])
+            if choice == "SignUp":
+                    authentication.signup()
+            elif choice == "Login":
+                st.title("Have an account? :orange[Sign In]")
+                st.toast("Use your username and password to access our services", icon='😍')
+                authentication.login()
+            elif choice == "Contact Us":
+                contact_form.main()
+                 
+                 
+                 
+        with row1_col2:
+                st.title(":orange[App Description]")
+
+                st.markdown("""
+                Our application is designed to empower farmers and land managers with precise, up-to-date information about their fields. Leveraging the power of advanced satellite imagery analysis, our tool provides key metrics like the Normalized Difference Vegetation Index (NDVI) to assess plant health, moisture levels, and overall field conditions.
+
+                #### :orange[Key Features]
+
+                - **:orange[Real-time Field Data]**: Access the latest satellite data to monitor your fields in real-time.
+                - **:orange[Field Health Analysis]**: Utilize NDVI and other indices to make informed decisions about crop health and management strategies.
+                - **:orange[Interactive Map Views]**: Explore your fields with interactive maps, get detailed insights with just a click.
+                - **:orange[Field History Tracking]**: Review historical data to track changes and adapt your farming practices accordingly.
+                - **:orange[Data-Driven Insights]**: Make better decisions with insights driven by accurate, reliable data.
+
+                We are committed to providing you with the tools you need to manage your fields more effectively and increase your yields. Get started by adding your fields and see the immediate benefits of precision agriculture.
+
+                For any questions or assistance, feel free to reach out through our contact page.
+
+                Happy Farming!
+                """, unsafe_allow_html=True)
 
-        elif choice == "Login":
-            authentication.login()
-        elif choice == "SignUp":
-            authentication.signup()
 
     return False
 
@@ -33,19 +62,21 @@ def main():
 
     if st.session_state.authenticated:
         st.sidebar.title("Navigation")
+        row1_col1, row1_col2 = st.columns([2, 1])
+
         options = st.sidebar.radio("Choose an option:", 
-                                   ("Add Field", "Manage Fields", "Monitor Fields"))
-        
-        if options == "Add Field":
-            st.title("Welcome to :orange[Field Monitoring App]")
-
-            add_field.add_drawing()
-            
-        elif options == "Manage Fields":
-            st.title(":orange[Field Management]")
-            edit.edit_fields()
+                                    ("Add and Manage Fields", "Monitor Fields"))
+        if options == "Add and Manage Fields":
+            with  row1_col1:
+                st.title("Welcome to :orange[Field Monitoring App]")
+                add_field.add_drawing()
+            with row1_col2:
+                st.title(":orange[Field Management]")
+                current_user = greeting("Manage your fields")
+
+                edit.edit_fields(current_user)  
+
         elif options == "Monitor Fields":
-            st.title(":orange[Field Monitoring]")
             monitor.monitor_fields()
     else:
         authenticate_user()

authentication.py

@@ -172,4 +172,4 @@ def login():
             st.warning("Incorrect Username/Password")
 
 # Call create_usertable to ensure the table is created/updated when the script runs
-create_usertable()
+create_usertable()

pag/add_field.py

@@ -1,3 +1,4 @@
+# add_field.py
 import utils
 import os
 import folium
@@ -8,12 +9,10 @@ from folium.plugins import Draw
 from shapely.geometry import Polygon
 from streamlit_folium import st_folium
 from authentication import greeting, check_password
-from functools import partial
 import geopy
 from pyproj import  Transformer
 from shapely.ops import transform
 from geopy.geocoders import Nominatim
-from streamlit_folium import folium_static
 from shapely.ops import transform
 from geopy.geocoders import Nominatim
 
@@ -38,7 +37,7 @@ def display_existing_fields(current_user):
     with st.expander("Existing Fields", expanded=False):
         if os.path.exists(f"fields_{current_user}.parquet"):
             gdf = gpd.read_parquet(f"fields_{current_user}.parquet")
-            st.write(gdf)
+            st.table(gdf.name.tolist())
             mm = gdf.explore()
             st_folium(mm)
         else:
@@ -80,6 +79,7 @@ def display_map_and_drawing_controls(field_map, center_start):
         st.info("IMPORTANT: Click on the drawing to confirm the drawn field", icon="🚨")
         sat_basemap = utils.basemaps['Google Satellite Hybrid']  # Change this line to use 'Google Satellite Hybrid'
         sat_basemap.add_to(field_map)
+        folium.plugins.Geocoder().add_to(field_map)
         folium.LayerControl().add_to(field_map)
         output = st_folium(field_map, center=center_start, zoom=zoom_start, key="new", width=800)
         active_drawing = output['last_active_drawing']

pag/edit.py

@@ -1,15 +1,13 @@
+# edit.py
 import os
 import utils
 import streamlit as st
 import geopandas as gpd
-from streamlit_folium import st_folium, folium_static
-from authentication import greeting, check_password
+from streamlit_folium import folium_static
 import folium
-import json
 import time
 import pandas as pd
 
-
 def add_properties(df, col_name, value, field_name):
     if col_name not in df.columns:
         df[col_name] = None
@@ -41,8 +39,8 @@ def read_custom_property():
     return custom_property_name, custom_property_value
 
 
-def edit_fields():
-    current_user = greeting("Manage your fields")
+def edit_fields(current_user):
+    # current_user = greeting("Manage your fields")
     fields_file_path = f"fields_{current_user}.parquet"
     history_file_path = f"history_{current_user}.csv"
     
@@ -60,21 +58,21 @@ def edit_fields():
         history_df = pd.DataFrame(columns=['field_name', 'start_date', 'end_date', 'crop', 'irrigation_method'])
 
     st.info("Hover over the field to show the properties or check the Existing Fields List below")
-    fields_map = gdf.explore()
-    sat_basemap = utils.basemaps['Google Satellite']
-    sat_basemap.add_to(fields_map)
-    folium.LayerControl().add_to(fields_map)
-    folium_static(fields_map, height=300, width=600)
-    
-    with st.expander("Existing Fields List", expanded=False):
-        # lis = [(f"Name:{gdf.iloc[i]['name']}",f"location: {gdf.iloc[i]['geometry']}" )for i in range(len(gdf))]
-        st.write(gdf)
-
     field_name = select_field(gdf)
     if field_name == "Select Field":
+        fields_map = gdf.explore()
+        sat_basemap = utils.basemaps['Google Satellite']
+        sat_basemap.add_to(fields_map)
+        folium.LayerControl().add_to(fields_map)
+        folium_static(fields_map, height=300, width=400)
         st.info("No Field Selected Yet!")
     else:
-        st.subheader(field_name)
+        fields_map = gdf[gdf['name'] == field_name].explore()
+        sat_basemap = utils.basemaps['Google Satellite']
+        sat_basemap.add_to(fields_map)
+        folium.LayerControl().add_to(fields_map)
+        folium_static(fields_map, height=300, width=400)
+        st.subheader(f":green[{field_name}]")
         option_menu = st.radio(f"Please add your {field_name} field information, historical data will help train our AI model", options=["View Field Info", "Add Field Information","Add Field Cultivation History", "Delete"], key="option_menu", help="Select the operation to perform")
         if option_menu == "View Field Info":
             field = gdf[gdf['name'] == field_name]
@@ -105,7 +103,6 @@ def edit_fields():
                 if custom_property_name != "" and custom_property_value != "":
                     gdf = add_properties(gdf, custom_property_name, custom_property_value, field_name)
                 gdf.to_parquet(f"fields_{current_user}.parquet")
-                # st.rerun()
                 st.success("Field Information Updated Successfully!")
                 st.info("Please Select View above to see the updated field information")
 

pag/monitor.py

@@ -1,22 +1,15 @@
+# monitor.py
 import os
 import utils
 import streamlit as st
 import geopandas as gpd
-from streamlit_folium import st_folium, folium_static
 from authentication import greeting, check_password
-import folium
 from senHub import SenHub
 from datetime import datetime
-from sentinelhub import  SHConfig, MimeType
+from sentinelhub import  SHConfig
 import requests
 import process
-import joblib
 from zipfile import ZipFile
-import matplotlib.pyplot as plt
-from plotly.subplots import make_subplots
-import plotly.graph_objects as go
-import pydeck as pdk
-import pandas as pd
 import plotly.express as px
 
 def check_authentication():
@@ -87,7 +80,7 @@ def get_cuarted_df_for_field(df, field, date, metric, clientName):
 
 
 def track(metric, field_name, src_df, client_name):
-
+    st.title(":green[Select Date and Start Monitoring]")
     dates = []
     date = -1
     if 'dates' not in st.session_state:
@@ -147,38 +140,22 @@ def track(metric, field_name, src_df, client_name):
             field_data = metric_data.merge(cloud_cover_data, on='geometry')
 
         # Display the field data
-        st.write(f'Field Data for {field_name} (Field ID: {field_name}) on {date}')
-        st.write(field_data.head(2))
+        avg_clp = field_data[f'CLP_{date}'].mean() *100
+        avg_metric = field_data[f'{metric}_{date}'].mean() 
+        st.write(f'Field Data for (Field ID: {field_name}) on {date}')
+        col1,col3,col5,col2,col4 = st.columns(5)
+        col1.metric(f":orange[Average {metric}]", value=f"{avg_metric :.2f}")
+        col2.metric(":green[Cloud Cover]",  value=f"{avg_clp :.2f}%")
 
         #Get Avarage Cloud Cover
-        avg_clp = field_data[f'CLP_{date}'].mean() *100
 
         # If the avarage cloud cover is greater than 80%, display a warning message
         if avg_clp > 80:
             st.warning(f'⚠️ The Avarage Cloud Cover is {avg_clp}%')
             st.info('Please Select A Different Date')
 
-        ## Generate the field data Map ##
-
-        #Title, Colormap and Legend
-        title = f'{metric} for selected field {field_name} (Field ID: {field_name}) in {date}'
-        cmap = 'RdYlGn'
-
-        # Create a map of the field data
-        # field_data_map  = field_data.explore(
-        #     column=f'{metric}_{date}',
-        #     cmap=cmap,
-        #     legend=True,
-        #     vmin=0,
-        #     vmax=1,
-        #     marker_type='circle', marker_kwds={'radius':5.3, 'fill':True})
-        
-        # Add Google Satellite as a base map
-        # google_map = utils.basemaps['Google Satellite']
-        # google_map.add_to(field_data_map)
+  
 
-        # # Display the map
-        # st_folium(field_data_map, width = 725, key=f'Field Data Map - {metric}')
         df = field_data.copy()
         df['latitude'] = df['geometry'].y
         df['longitude'] = df['geometry'].x
@@ -191,6 +168,8 @@ def track(metric, field_name, src_df, client_name):
             color=f'{metric}_{date}',
             color_continuous_scale='RdYlGn',
             range_color=(0, 1),
+            width= 800,
+            height=600,
             size_max=15,
             zoom=13,
         )
@@ -251,32 +230,34 @@ def track(metric, field_name, src_df, client_name):
            
 
 def monitor_fields():
-    current_user = greeting("Let's take a look how these fields are doing")
-    if os.path.exists(f"fields_{current_user}.parquet"):
-        gdf = gpd.read_parquet(f"fields_{current_user}.parquet")
-    else:
-        st.info("No Fields Added Yet!")
-        return
+    row1,row2 = st.columns([1,2])
+    with row1:
+        st.title(":orange[Field Monitoring]")
+
+        current_user = greeting("Let's take a look how these fields are doing")
+        if os.path.exists(f"fields_{current_user}.parquet"):
+            gdf = gpd.read_parquet(f"fields_{current_user}.parquet")
+            field_name = select_field(gdf)
+            if field_name == "Select Field":
+                st.info("No Field Selected Yet!")  
+            else:
+                metric = st.radio("Select Metric to Monitor", ["NDVI", "LAI", "CAB"], key="metric", index=0, help="Select the metric to monitor")
+                st.success(f"Monitoring {metric} for {field_name}")
+                with st.expander("Metrics Explanation", expanded=False):
+                    st.write("NDVI: Normalized Difference Vegetation Index, Mainly used to monitor the health of vegetation")
+                    st.write("LAI: Leaf Area Index, Mainly used to monitor the productivity of vegetation")
+                    st.write("CAB: Chlorophyll Absorption in the Blue band, Mainly used to monitor the chlorophyll content in vegetation")
+                    # st.write("NDMI: Normalized Difference Moisture Index, Mainly used to monitor the moisture content in vegetation")
+                st.info("More metrics and analysis features will be added soon")
+        else:
+            st.info("No Fields Added Yet!")
+            return
 
-    
-    with st.expander("Existing Fields List", expanded=False):
-        st.write(gdf)
+        
 
-    field_name = select_field(gdf)
-    if field_name == "Select Field":
-        st.info("No Field Selected Yet!")
-    
-    else:
-        with st.expander("Metrics Explanation", expanded=False):
-            st.write("NDVI: Normalized Difference Vegetation Index, Mainly used to monitor the health of vegetation")
-            st.write("LAI: Leaf Area Index, Mainly used to monitor the productivity of vegetation")
-            st.write("CAB: Chlorophyll Absorption in the Blue band, Mainly used to monitor the chlorophyll content in vegetation")
-            # st.write("NDMI: Normalized Difference Moisture Index, Mainly used to monitor the moisture content in vegetation")
-        st.success("More metrics and analysis features will be added soon")
-        metric = st.radio("Select Metric to Monitor", ["NDVI", "LAI", "CAB"], key="metric", index=0, help="Select the metric to monitor")
-        st.write(f"Monitoring {metric} for {field_name}")
-
-        track(metric, field_name, gdf, current_user)
+        with row2:
+            if field_name != "Select Field":
+                track(metric, field_name, gdf, current_user)