Update app.py

app.py

@@ -1,132 +1,109 @@
 import os
-import time
-import threading
-import requests
 import folium
-from flask import Flask, render_template, jsonify, redirect, url_for, session
+from flask import Flask, render_template, jsonify, request, redirect, url_for, session
 import firebase_admin
 from firebase_admin import credentials, firestore
-from twilio.rest import Client
 
-# Flask app initialization
+# Initialize Flask app
 app = Flask(__name__)
-app.secret_key = os.urandom(24)
+app.secret_key = os.urandom(24)  # For session management
+
+# Initialize Firebase
+# try:
+#     firebase_admin.get_app()
+# except ValueError:
+#     cred = credentials.Certificate({
+#         "type": "service_account",
+#         "project_id": "snippetscript-37175",
+#         "private_key_id": "your_private_key_id",
+#         "private_key": "your_private_key",
+#         "client_email": "your_client_email",
+#         "client_id": "your_client_id",
+#         "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+#         "token_uri": "https://oauth2.googleapis.com/token",
+#         "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+#         "client_x509_cert_url": "your_cert_url"
+#     })
+#     firebase_admin.initialize_app(cred)
+
+# Initialize Firestore
+# db = firestore.client()
 
-# Firebase and Firestore Initialization
-FIREBASE_CREDENTIALS_PATH = "snippetscript-37175-firebase-adminsdk-cf1z8-7d509b09fd.json"
-cred = credentials.Certificate(FIREBASE_CREDENTIALS_PATH)
-firebase_admin.initialize_app(cred)
-db = firestore.client()
-
-# Twilio Configuration
-ACCOUNT_SID = 'AC97ad50edcf94fdd7d4576be9651bf4bf'
-AUTH_TOKEN = '6d8b2559ffbbdbc5d06542e545220aaa'
-FROM_PHONE = '+12708175529'
-TO_PHONE = '+916382792828'
-
-# ThingSpeak Configuration
-THINGSPEAK_API_KEY = "P54KXM40TA3CB6W4"
-CHANNEL_ID = "2784385"
-last_entry_id = None
-
-
-# Function to fetch data from ThingSpeak
-def fetch_thingspeak_data():
-    global last_entry_id
-    try:
-        url = f"https://api.thingspeak.com/channels/{CHANNEL_ID}/feeds.json?api_key={THINGSPEAK_API_KEY}"
-        response = requests.get(url)
-        response.raise_for_status()
-        data = response.json()
-
-        # Check for new data
-        if data.get('feeds'):
-            latest_feed = data['feeds'][-1]
-            current_entry_id = latest_feed.get('entry_id')
-
-            if current_entry_id != last_entry_id:
-                last_entry_id = current_entry_id
-                return latest_feed
-        return None
-    except requests.RequestException as e:
-        print(f"Error fetching ThingSpeak data: {e}")
-        return None
-
-
-# Function to store data in Firestore
-def store_data_in_firestore(data):
-    try:
-        if data:
-            doc_data = {
-                'field1': data.get('field1'),
-                'field2': data.get('field2'),
-                'entry_id': data.get('entry_id'),
-                'timestamp': firestore.SERVER_TIMESTAMP
-            }
-            db.collection('thingspeak_data').add(doc_data)
-            print("New data successfully stored in Firestore")
-    except Exception as e:
-        print(f"Error storing data in Firestore: {e}")
-
-
-# Twilio SMS Sending Function
-def send_sms(field1):
-    client = Client(ACCOUNT_SID, AUTH_TOKEN)
-    try:
-        message = client.messages.create(
-            from_=FROM_PHONE,
-            body=f"""E.coli Level: {field1}
-Status: safe
-Suggestions:
-You may heat your water to eradicate the bacteria.""",
-            to=TO_PHONE
-        )
-        print(f"Message sent successfully! SID: {message.sid}")
-    except Exception as e:
-        print(f"Failed to send message: {e}")
-
-
-# Firestore Listener
-def start_firestore_listener():
-    def on_snapshot(doc_snapshot, changes, read_time):
-        for change in changes:
-            if change.type.name == 'ADDED':
-                new_data = change.document.to_dict()
-                field1 = new_data.get('field1', 'N/A')
-                print(f"New Firestore data: {new_data}")
-                send_sms(field1)
-
-    thingspeak_ref = db.collection('thingspeak_data')
-    thingspeak_ref.on_snapshot(on_snapshot)
-    print("Listening for Firestore changes...")
-
-
-# Background Task for Fetching ThingSpeak Data
-def background_thingspeak_to_firestore():
-    while True:
-        thingspeak_data = fetch_thingspeak_data()
-        if thingspeak_data:
-            store_data_in_firestore(thingspeak_data)
-        time.sleep(10)  # Adjust interval as needed
-
-
-# Flask Routes
 @app.route('/')
 def index():
     return render_template('index.html')
 
+@app.route('/user-dashboard.html')
+def user_dashboard():
+    return render_template('user-dashboard.html')
 
+@app.route('/get-previous-results', methods=['GET'])
+def get_previous_results():
+    try:
+        # Simulating a ThingSpeak API call or shared data
+        # response = requests.get("https://api.thingspeak.com/...", params=...)
+        # thingspeak_data = response.json()
+
+        # Returning shared data for all users
+        return jsonify({"status": "success", "data": thingspeak_data})
+    except Exception as e:
+        return jsonify({"status": "error", "message": str(e)})
+
+# @app.route('/login', methods=['POST'])
+# def login():
+#     phone = request.form['loginPhone']
+#     password = request.form['loginPassword']
+
+#     # Query Firestore to find user
+#     users_ref = db.collection('users')
+#     query = users_ref.where('phone', '==', phone).where('password', '==', password)
+    
+#     try:
+#         users = query.stream()
+#         user_list = list(users)
+        
+#         if len(user_list) > 0:
+#             # User found, start session
+#             session['user_phone'] = phone
+#             return redirect(url_for('user_dashboard'))
+#         else:
+#             return "Invalid credentials", 401
+    
+#     except Exception as e:
+#         return str(e), 500
+
+# @app.route('/dashboard')
+# def user_dashboard():
+#     if 'user_phone' not in session:
+#         return redirect(url_for('index'))
+    
+#     # Fetch user details from Firestore
+#     user_ref = db.collection('users').document(session['user_phone'])
+#     user = user_ref.get()
+    
+#     if user.exists:
+#         user_data = user.to_dict()
+#         return render_template('user-dashboard.html', user=user_data)
+#     else:
+        # return "User not found", 404
+
+# @app.route('/admin.html')
+# def admin():
+#     return render_template('admin.html')
 @app.route('/admin.html')
 def admin():
+    # Create a map centered on Delhi
     delhi_coordinates = [28.6139, 77.2090]
     folium_map = folium.Map(location=delhi_coordinates, zoom_start=12)
 
+    # Add predefined markers in Delhi
     markers = [
         {"name": "India Gate", "coordinates": [28.6129, 77.2295]},
         {"name": "Red Fort", "coordinates": [28.6562, 77.2410]},
         {"name": "Qutub Minar", "coordinates": [28.5245, 77.1855]},
     ]
 
+    # Add markers to the map
     for marker in markers:
         folium.Marker(
             location=marker["coordinates"],
@@ -134,22 +111,30 @@ def admin():
             icon=folium.Icon(color="blue", icon="info-sign"),
         ).add_to(folium_map)
 
+    # Use a valid Folium tile layer
     folium.TileLayer('OpenStreetMap').add_to(folium_map)
+
+    # Add Layer Control for toggling between tile layers
     folium.LayerControl().add_to(folium_map)
+
+    # Generate the map HTML
     map_html = folium_map._repr_html_()
-    return render_template('admin.html', map=map_html)
 
+    # Render the template with the map
+    return render_template('admin.html', map=map_html)
 
 @app.route('/logout')
 def logout():
+    # Remove the user's phone number from the session
     session.pop('user_phone', None)
+
+    # Redirect to the index route (function name, not the file name)
     return redirect(url_for('index'))
 
 
+
+
 if __name__ == '__main__':
     # Start background threads
-    threading.Thread(target=background_thingspeak_to_firestore, daemon=True).start()
-    threading.Thread(target=start_firestore_listener, daemon=True).start()
-
-    # Run the Flask app
+   
     app.run(host='0.0.0.0', port=7860, debug=True)