Update email function for new signup user and create user

Author: codeperfectplus

src/models/__init__.py

@@ -18,7 +18,7 @@
     print("Creating tables")
     db.create_all()
 
-    # initialize default dashboard settings for users
+    # initialize default dashboard user_dashboard_settings for users
     users = UserProfile.query.all()
     for user in users:
         if not user.dashboard_settings:
@@ -45,7 +45,7 @@
             db.session.add(user)
             db.session.commit()
 
-    # Initialize default settings
+    # Initialize default user_dashboard_settings
     general_settings = ApplicationGeneralSettings.query.first()
     if not general_settings:
         db.session.add(ApplicationGeneralSettings())
@@ -56,17 +56,17 @@
 @app.context_processor
 def inject_settings():
     if current_user.is_anonymous:
-        return dict(settings=None, card_settings=None)
+        return dict(user_dashboard_settings=None, card_settings=None)
     general_settings = ApplicationGeneralSettings.query.first()
     card_settings = UserCardSettings.query.filter_by(user_id=current_user.id).first()
-    settings = UserDashboardSettings.query.filter_by(
+    user_dashboard_settings = UserDashboardSettings.query.filter_by(
         user_id=current_user.id
-    ).first()  # Retrieve user-specific settings from DB
+    ).first()  # Retrieve user-specific user_dashboard_settings from DB
     feature_toggles_settings = FeatureToggleSettings.query.filter_by(
         user_id=current_user.id
     ).first()
     all_settings = dict(
-        settings=settings,
+        user_dashboard_settings=user_dashboard_settings,
         general_settings=general_settings,
         card_settings=card_settings,
         feature_toggles_settings=feature_toggles_settings,

src/routes/dashbaord.py

@@ -11,50 +11,52 @@
 @app.route("/dashboard", methods=["GET"])
 @login_required
 def dashboard():
-    settings = UserDashboardSettings.query.first()
-    SPEEDTEST_COOLDOWN_IN_HOURS = settings.speedtest_cooldown
+    user_dashboard_settings = UserDashboardSettings.query.first()
     system_info = get_system_info()
 
     # Fetch the last speedtest result
-    n_hour_ago = datetime.datetime.now() - datetime.timedelta(
-        hours=SPEEDTEST_COOLDOWN_IN_HOURS)
-    recent_results = NetworkSpeedTestResult.query.filter(
-        NetworkSpeedTestResult.timestamp > n_hour_ago).all()
-    last_timestamp = (
-        datetimeformat(recent_results[-1].timestamp) if recent_results else None
+    speedtest_cooldown_time = datetime.datetime.now() - datetime.timedelta(minutes=user_dashboard_settings.speedtest_cooldown)
+    recent_speedtest_results = NetworkSpeedTestResult.query.filter(
+        NetworkSpeedTestResult.timestamp > speedtest_cooldown_time
+    ).all()
+    last_speedtest_timestamp = (
+        datetimeformat(recent_speedtest_results[-1].timestamp) if recent_speedtest_results else None
     )
 
-    if recent_results:
-        # Display the most recent result from the database
-        latest_result = recent_results[-1]
-        speedtest_result = {
-            "download_speed": latest_result.download_speed,
-            "upload_speed": latest_result.upload_speed,
-            "ping": latest_result.ping,
-        }
-        source = "Database"
+    if recent_speedtest_results:
+        latest_result = recent_speedtest_results[-1]
+        
+        
         next_test_time = latest_result.timestamp + datetime.timedelta(
-            hours=SPEEDTEST_COOLDOWN_IN_HOURS
+            minutes=user_dashboard_settings.speedtest_cooldown
         )
-        show_prompt = False
         remaining_time_for_next_test = round(
             (next_test_time - datetime.datetime.now()).total_seconds() / 60
         )
+        speedtest_result = {
+            "download_speed": latest_result.download_speed,
+            "upload_speed": latest_result.upload_speed,
+            "ping": latest_result.ping,
+            "source": "Database",
+            "show_prompt": False,
+            "remaining_time_for_next_test": remaining_time_for_next_test,
+        }
     else:
         # No recent results, prompt to perform a test
-        speedtest_result = None
-        source = None
-        show_prompt = True
-        remaining_time_for_next_test = None
+        speedtest_result = {
+            "download_speed": None,
+            "upload_speed": None,
+            "ping": None,
+            "source": None,
+            "show_prompt": True,
+            "remaining_time_for_next_test": None,
+        }
 
     return render_template(
             "dashboard/developer.html",
             system_info=system_info,
             speedtest_result=speedtest_result,
-            source=source,
-            last_timestamp=last_timestamp,
-            next_test_time=remaining_time_for_next_test,
-            show_prompt=show_prompt,
+            last_timestamp=last_speedtest_timestamp,
             current_user=current_user,
         )
 

src/routes/settings.py

@@ -2,7 +2,7 @@
 from flask import render_template, request, flash, blueprints, redirect, url_for
 
 from src.config import app, db
-from src.models import UserCardSettings, UserDashboardSettings, UserProfile, ApplicationGeneralSettings
+from src.models import UserCardSettings, UserDashboardSettings, UserProfile, ApplicationGeneralSettings, FeatureToggleSettings
 from flask_login import login_required, current_user
 from src.utils import render_template_from_file
 from src.scripts.email_me import send_smpt_email
@@ -12,14 +12,14 @@
 @app.route('/settings/speedtest', methods=['GET', 'POST'])
 @login_required
 def speedtest_settings():
-    settings = UserDashboardSettings.query.filter_by(user_id=current_user.id).first()  # Retrieve user-specific settings from DB
+    user_dashboard_settings = UserDashboardSettings.query.filter_by(user_id=current_user.id).first()  # Retrieve user-specific settings from DB
     if request.method == 'POST':
-        settings.speedtest_cooldown = request.form.get('speedtest_cooldown')
-        settings.number_of_speedtests = request.form.get('number_of_speedtests')
+        user_dashboard_settings.speedtest_cooldown = request.form.get('speedtest_cooldown')
+        user_dashboard_settings.number_of_speedtests = request.form.get('number_of_speedtests')
         db.session.commit()
         flash('Speedtest settings updated successfully!', 'success')
         return redirect(url_for('speedtest_settings'))
-    return render_template('speedtest_settings.html', settings=settings)
+    return render_template('speedtest_settings.html', user_dashboard_settings=user_dashboard_settings)
 
 @app.route('/settings/general', methods=['GET', 'POST'])
 @login_required
@@ -48,17 +48,17 @@ def general_settings():
 @app.route('/settings/feature-toggles', methods=['GET', 'POST'])
 @login_required
 def feature_toggles():
-    settings = UserDashboardSettings.query.filter_by(user_id=current_user.id).first()  # Retrieve user-specific settings from DB
+    feature_toggles_settings = FeatureToggleSettings.query.filter_by(user_id=current_user.id).first()  # Retrieve user-specific settings from DB
     if request.method == 'POST':
-        settings.is_cpu_info_enabled = 'is_cpu_info_enabled' in request.form
-        settings.is_memory_info_enabled = 'is_memory_info_enabled' in request.form
-        settings.is_disk_info_enabled = 'is_disk_info_enabled' in request.form
-        settings.is_network_info_enabled = 'is_network_info_enabled' in request.form
-        settings.is_process_info_enabled = 'is_process_info_enabled' in request.form
+        feature_toggles_settings.is_cpu_info_enabled = 'is_cpu_info_enabled' in request.form
+        feature_toggles_settings.is_memory_info_enabled = 'is_memory_info_enabled' in request.form
+        feature_toggles_settings.is_disk_info_enabled = 'is_disk_info_enabled' in request.form
+        feature_toggles_settings.is_network_info_enabled = 'is_network_info_enabled' in request.form
+        feature_toggles_settings.is_process_info_enabled = 'is_process_info_enabled' in request.form
         db.session.commit()
         flash('Feature toggles updated successfully!', 'success')
         return redirect(url_for('feature_toggles'))
-    return render_template('feature_toggles.html', settings=settings)
+    return render_template('feature_toggles.html', feature_toggles_settings=feature_toggles_settings)
 
 @app.route('/settings/card-toggles', methods=['GET', 'POST'])
 @login_required

src/routes/speedtest.py

@@ -1,65 +1,69 @@
 import datetime
-from flask import render_template, blueprints
+from flask import render_template, Blueprint
 from flask_login import login_required, current_user
 from src.config import app, db
-from src.models import UserCardSettings, NetworkSpeedTestResult
+from src.models import UserDashboardSettings, NetworkSpeedTestResult
 from src.utils import run_speedtest, render_template_from_file
 from src.scripts.email_me import send_smpt_email
 
-speedtest_bp = blueprints.Blueprint("speedtest", __name__)
+speedtest_bp = Blueprint("speedtest", __name__)
 
 @app.route("/speedtest")
 @login_required
 def speedtest():
-    settings = UserCardSettings.query.first()
-    SPEEDTEST_COOLDOWN_IN_HOURS = settings.speedtest_cooldown
-    NUMBER_OF_SPEEDTESTS = settings.number_of_speedtests
-    n_hour_ago = datetime.datetime.now() - datetime.timedelta(
-        hours=SPEEDTEST_COOLDOWN_IN_HOURS
+    user_dashboard_settings = UserDashboardSettings.query.first()
+    speedtest_cooldown_duration = user_dashboard_settings.speedtest_cooldown
+    required_speedtest_count = user_dashboard_settings.number_of_speedtests
+
+    cooldown_threshold_time = datetime.datetime.now() - datetime.timedelta(
+        minutes=speedtest_cooldown_duration
     )
-    recent_results = NetworkSpeedTestResult.query.filter(
-        NetworkSpeedTestResult.timestamp > n_hour_ago
+    
+    recent_speedtest_results = NetworkSpeedTestResult.query.filter(
+        NetworkSpeedTestResult.timestamp > cooldown_threshold_time
     ).all()
 
-    if len(recent_results) < NUMBER_OF_SPEEDTESTS:
-        speedtest_result = run_speedtest()
-        if speedtest_result["status"] == "Error":
+    if len(recent_speedtest_results) < required_speedtest_count:
+        current_speedtest_result = run_speedtest()
+        
+        if current_speedtest_result["status"] == "Error":
             return render_template(
-                "error/speedtest_error.html", error=speedtest_result["message"]
+                "error/speedtest_error.html", error=current_speedtest_result["message"]
             )
 
-        if speedtest_result:
-            new_result = NetworkSpeedTestResult(
-                download_speed=speedtest_result["download_speed"],
-                upload_speed=speedtest_result["upload_speed"],
-                ping=speedtest_result["ping"],
+        if current_speedtest_result:
+            new_speedtest_record = NetworkSpeedTestResult(
+                download_speed=current_speedtest_result["download_speed"],
+                upload_speed=current_speedtest_result["upload_speed"],
+                ping=current_speedtest_result["ping"],
             )
-            db.session.add(new_result)
+            db.session.add(new_speedtest_record)
             db.session.commit()
+
             receiver_email = current_user.email
             subject = "Speedtest Result"
-            context = {"speedtest_result": speedtest_result}
+            context = {"speedtest_result": current_speedtest_result}
             body = render_template_from_file("src/templates/email_templates/speedtest_result.html", **context)
             send_smpt_email(receiver_email, subject, body, is_html=True)
+
             return render_template(
                 "speedtest_result.html",
-                speedtest_result=speedtest_result,
+                speedtest_result=current_speedtest_result,
                 source="Actual Test",
             )
     else:
-        latest_result = recent_results[-1]
-        next_test_time = latest_result.timestamp + datetime.timedelta(
-            hours=SPEEDTEST_COOLDOWN_IN_HOURS
+        latest_speedtest_record = recent_speedtest_results[-1]
+        next_test_time = latest_speedtest_record.timestamp + datetime.timedelta(
+            minutes=speedtest_cooldown_duration
         )
         remaining_time_for_next_test = round(
             (next_test_time - datetime.datetime.now()).total_seconds() / 60
         )
+
         return render_template(
             "speedtest_result.html",
-            speedtest_result=latest_result,
+            speedtest_result=latest_speedtest_record,
             source="Database",
             next_test_time=next_test_time,
             remaining_time_for_next_test=remaining_time_for_next_test,
         )
-
-

src/scripts/battery_tracking.py

@@ -1,7 +1,7 @@
 import psutil
 import os
 from datetime import datetime, timedelta
-from src.utils.email_me import send_smpt_email
+from src.scripts.email_me import send_email
 
 STATUS_FILE = 'battery_status.txt'
 NOTIFICATION_INTERVAL = timedelta(hours=1)  # Minimum time between notifications

src/templates/card_toggles.html

@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 {% block title %}Card Toggles{% endblock %}
 {% block extra_head %}
-<link rel="stylesheet" href="{{ url_for('static', filename='css/card_settings.css') }}">
+<link rel="stylesheet" href="{{ url_for('static', filename='css/settings.css') }}">
 {% endblock %}
 {% block content %}
 <div class="settings-container">

src/templates/dasbhboard_comp/other/speedtest.html

@@ -2,11 +2,12 @@
 <div class="col-md-12 mb-4">
     <div class="card bg-speedtest">
         <div class="card-body">
-            <h5 class="card-title">Perform Speed Test <i class="fas fa-clock"></i></h5>{% if speedtest_result %} <p
+            <h5 class="card-title">Perform Speed Test <i class="fas fa-clock"></i></h5>{% if not speedtest_result["show_prompt"] %} <p
                 class="card-text fs-4">Download Speed:{{ speedtest_result["download_speed"]}}</p>
             <p class="card-text fs-4">Upload Speed:{{ speedtest_result["upload_speed"]}}</p>
             <p class="card-text fs-4">Test Last Performed:{{ last_timestamp}}</p>
-            <p class="card-text fs-4">Try again test in :{{ next_test_time}} mins</p>{% endif %} {% if show_prompt %} <a
+            <p class="card-text fs-4">Try again test in :{{ speedtest_result["remaining_time_for_next_test"] }} mins</p>{% endif %} 
+            {% if speedtest_result["show_prompt"] %} <a
                 href="{{ url_for('speedtest')}}" class="btn btn-light">Run Speed Test</a>{% endif %}
         </div>
     </div>

src/templates/dasbhboard_comp/other/uptime.html

@@ -1,10 +1,50 @@
 {% if card_settings.is_system_uptime_card_enabled %}
 <div class="col-md-6 col-lg-6 mb-4">
-    <div class="card bg-uptime" data-disk="{{ system_info['disk_usage']}}" shadow-sm border-0 rounded-3>
+    <div class="card bg-uptime shadow-sm border-0 rounded-3">
         <div class="card-body bg-uptime">
             <h5 class="card-title">System Uptime <i class="fas fa-clock"></i></h5>
-            <p class="card-text fs-4">{{ system_info['uptime']}}</p>
+            <p class="card-text fs-4" id="system-uptime">
+                {{ system_info['uptime_days'] }} days, {{ system_info['uptime_hours'] }} hours, 
+                {{ system_info['uptime_minutes'] }} minutes, {{ system_info['uptime_seconds'] }} seconds
+            </p>
         </div>
     </div>
 </div>
-{% endif %}
+{% endif %}
+
+<script>
+// Function to format uptime as 'X days, Y hours, Z minutes, W seconds'
+function formatUptime(days, hours, minutes, seconds) {
+    let uptimeString = `${days} days, ${hours} hours, ${minutes} minutes, ${seconds} seconds`;
+    return uptimeString;
+}
+
+// Initial uptime values from the backend
+let days = parseInt('{{ system_info["uptime_days"] }}');
+let hours = parseInt('{{ system_info["uptime_hours"] }}');
+let minutes = parseInt('{{ system_info["uptime_minutes"] }}');
+let seconds = parseInt('{{ system_info["uptime_seconds"] }}');
+
+// Function to update uptime
+function updateUptime() {
+    seconds++;
+    if (seconds >= 60) {
+        seconds = 0;
+        minutes++;
+        if (minutes >= 60) {
+            minutes = 0;
+            hours++;
+            if (hours >= 24) {
+                hours = 0;
+                days++;
+            }
+        }
+    }
+
+    // Update the display
+    document.getElementById('system-uptime').textContent = formatUptime(days, hours, minutes, seconds);
+}
+
+// Update the uptime every second
+setInterval(updateUptime, 1000);
+</script>

src/templates/feature_toggles.html

@@ -12,27 +12,27 @@ <h1 class="settings-title">Feature Toggles</h1>
 
         <div class="form-group">
             <label for="is_cpu_info_enabled">Enable CPU Information:</label>
-            <input type="checkbox" id="is_cpu_info_enabled" name="is_cpu_info_enabled" {% if settings.is_cpu_info_enabled %}checked{% endif %}>
+            <input type="checkbox" id="is_cpu_info_enabled" name="is_cpu_info_enabled" {% if feature_toggles_settings.is_cpu_info_enabled %}checked{% endif %}>
         </div>
 
         <div class="form-group">
             <label for="is_memory_info_enabled">Enable Memory Information:</label>
-            <input type="checkbox" id="is_memory_info_enabled" name="is_memory_info_enabled" {% if settings.is_memory_info_enabled %}checked{% endif %}>
+            <input type="checkbox" id="is_memory_info_enabled" name="is_memory_info_enabled" {% if feature_toggles_settings.is_memory_info_enabled %}checked{% endif %}>
         </div>
 
         <div class="form-group">
             <label for="is_disk_info_enabled">Enable Disk Information:</label>
-            <input type="checkbox" id="is_disk_info_enabled" name="is_disk_info_enabled" {% if settings.is_disk_info_enabled %}checked{% endif %}>
+            <input type="checkbox" id="is_disk_info_enabled" name="is_disk_info_enabled" {% if feature_toggles_settings.is_disk_info_enabled %}checked{% endif %}>
         </div>
 
         <div class="form-group">
             <label for="is_network_info_enabled">Enable Network Information:</label>
-            <input type="checkbox" id="is_network_info_enabled" name="is_network_info_enabled" {% if settings.is_network_info_enabled %}checked{% endif %}>
+            <input type="checkbox" id="is_network_info_enabled" name="is_network_info_enabled" {% if feature_toggles_settings.is_network_info_enabled %}checked{% endif %}>
         </div>
 
         <div class="form-group">
             <label for="is_process_info_enabled">Enable Process Information:</label>
-            <input type="checkbox" id="is_process_info_enabled" name="is_process_info_enabled" {% if settings.is_process_info_enabled %}checked{% endif %}>
+            <input type="checkbox" id="is_process_info_enabled" name="is_process_info_enabled" {% if feature_toggles_settings.is_process_info_enabled %}checked{% endif %}>
         </div>
 
         <button type="submit" class="btn btn-primary">Save Settings</button>