feat: email function added for new signup user and create user

Author: codeperfectplus

README.md

@@ -58,6 +58,22 @@ chmod +x install_miniconda.sh && sudo ./install_miniconda.sh
 - Easy download and installation using a bash script.
 - Logged user and admin user will get the notification if the user kill some process manully on dashbaord.
 
+## Email Feature 📧
+
+| Email Alert | Is implemented | who will get the email |
+| ----------- | -------------- | ---------------------- |
+| Process Killed | Yes | Logged User |
+| Login | Yes | Admin User and Logged User |
+| Logout | Yes | Logged User |
+| Signup | Yes | Admin User & signed up User |
+| Create User | Yes | Admin User & Created User |
+| Delete User | No | Admin User & Deleted User |
+| Speed Test | Yes | Logged User |
+| Server Up | Yes | Admin User |
+| Notification Settings Change | Yes | Admin User |
+| Signup | Yes(few changes required) | Admin User & Logged User |
+
+
 
 ## Product Screenshots 📸
 

app.py

@@ -3,7 +3,7 @@
 from src import routes
 from src.utils import render_template_from_file, get_flask_memory_usage, cpu_usage_percent, get_memory_percent
 from src.models import User
-from src.scripts.email_me import send_email
+from src.scripts.email_me import send_smpt_email
 
 def register_routes():
     app.register_blueprint(routes.homepage_bp)
@@ -31,7 +31,7 @@ def server_up_email():
 
             }
             html_body = render_template_from_file("src/templates/email_templates/server_up.html", **context)
-            # send_email(admin_emails, subject, html_body, is_html=True)
+            # send_smpt_email(admin_emails, subject, html_body, is_html=True)
             print("Server up email sent to", admin_emails)
 
 

src/routes/auth.py

@@ -8,7 +8,7 @@
 from flask import Flask, render_template, request, jsonify
 import subprocess
 
-from src.scripts.email_me import send_email
+from src.scripts.email_me import send_smpt_email
 
 from src.config import app, db
 from src.models import User, SmptEamilPasswordConfig, DashboardSettings
@@ -74,15 +74,18 @@ def login():
             # log in alert to admin
 
             if admin_email_address:
-                context = {"username": current_user.username, "login_time": datetime.datetime.now()}
-                login_body = render_template_from_file("src/templates/email_templates/admin_login_alert.html", **context)
-                # send_email(admin_email_address, 'Login Alert', login_body, is_html=True)
+                if receiver_email in admin_email_address:
+                    admin_email_address.remove(receiver_email)
+                if admin_email_address:
+                    context = {"username": current_user.username, "login_time": datetime.datetime.now()}
+                    login_body = render_template_from_file("src/templates/email_templates/admin_login_alert.html", **context)
+                    send_smpt_email(admin_email_address, 'Login Alert', login_body, is_html=True)
 
             # log in alert to user
             if receiver_email:
                 context = {"username": current_user.username, "login_time": datetime.datetime.now()}
                 login_body = render_template_from_file("src/templates/email_templates/login.html", **context)
-                # send_email(receiver_email, 'Login Alert', login_body, is_html=True)
+                send_smpt_email(receiver_email, 'Login Alert', login_body, is_html=True)
             return redirect(url_for('dashboard'))
         flash('Invalid username or password', 'danger')
     return render_template('login.html')
@@ -93,16 +96,19 @@ def logout():
     if receiver_email:
         context = {"username": current_user.username}
         logout_body = render_template_from_file("src/templates/email_templates/logout.html", **context)
-        # send_email(receiver_email, 'Logout Alert', logout_body, is_html=True)
+        send_smpt_email(receiver_email, 'Logout Alert', logout_body, is_html=True)
     logout_user()
     return redirect(url_for('login'))
 
 @app.route('/signup', methods=['GET', 'POST'])
 def signup():
     if request.method == 'POST':
         username = request.form['username']
+        email = request.form['email']
         password = request.form['password']
         confirm_password = request.form['confirm_password']
+        user_level = request.form.get('user_level', 'user')  # Default to 'user' if not provided
+        receive_email_alerts = 'receive_email_alerts' in request.form  # Checkbox is either checked or not
 
         if password != confirm_password:
             flash('Passwords do not match')
@@ -114,16 +120,29 @@ def signup():
             return redirect(url_for('signup'))
 
         hashed_password = generate_password_hash(password)
-        new_user = User(username=username, password=hashed_password)
+        new_user = User(username=username, email=email, password=hashed_password, user_level=user_level, receive_email_alerts=receive_email_alerts)
 
         # Get Admin Emails with Alerts Enabled:
         admin_email_address = get_email_addresses(user_level='admin', receive_email_alerts=True)
-        # extends the signup user to send an email to the admin
         if admin_email_address:
-            send_email(admin_email_address, 'New User Alert', f'{username} has signed up to the system.')
-        
-        # send email to the new user
-        send_email([new_user.email], 'Welcome to the system', f'Hello {new_user.username}, welcome to the system.')
+            subject = "New User Alert"
+            context = {
+                "username": new_user.username,
+                "email": new_user.email,
+                "signup_time": datetime.datetime.now(),
+                "user_level": new_user.user_level
+            }
+            html_body = render_template_from_file("src/templates/email_templates/new_user_alert.html", **context)
+            send_smpt_email(admin_email_address, subject, html_body, is_html=True)
+            
+        # Send email to the new user
+        subject = "Welcome to the systemGuard"  
+        context = {
+            "username": new_user.username,
+            "email": new_user.email,
+        }
+        html_body = render_template_from_file("src/templates/email_templates/welcome.html", **context)
+        send_smpt_email(email, subject, html_body, is_html=True)
 
         db.session.add(new_user)
         db.session.commit()
@@ -263,7 +282,7 @@ def send_email_page():
             attachment_path = f"/tmp/{attachment.filename}"
             attachment.save(attachment_path)
         try:
-            respose = send_email(receiver_email, subject, body, attachment_path)
+            respose = send_smpt_email(receiver_email, subject, body, attachment_path)
             print(respose)
             if respose and respose.get("status") == "success":
                 flash(respose.get("message"), "success")
@@ -293,7 +312,11 @@ def terminal():
     return render_template('terminal.html')
 
 @app.route('/add_user', methods=['GET', 'POST'])
+@login_required
 def add_user():
+    if current_user.user_level != 'admin':
+        flash("Your account does not have permission to view this page.", "danger")
+        return render_template("error/permission_denied.html")
     if request.method == 'POST':
         username = request.form['username']
         email = request.form['email']
@@ -313,6 +336,28 @@ def add_user():
             user_level=user_level,
             receive_email_alerts=receive_email_alerts
         )
+
+        admin_email_address = get_email_addresses(user_level='admin', receive_email_alerts=True)
+        if admin_email_address:
+            subject = "New User Alert"
+            context = {
+                "current_user": current_user.username,
+                "username": new_user.username,
+                "email": new_user.email,
+                "signup_time": datetime.datetime.now(),
+                "user_level": new_user.user_level
+            }
+            html_body = render_template_from_file("src/templates/email_templates/new_user_create.html", **context)
+            send_smpt_email(admin_email_address, subject, html_body, is_html=True)
+
+        subject = "Welcome to the systemGuard"  
+        context = {
+            "username": new_user.username,
+            "email": new_user.email,
+        }
+        html_body = render_template_from_file("src/templates/email_templates/welcome.html", **context)
+        send_smpt_email(email, subject, html_body, is_html=True)
+            
         db.session.add(new_user)
         db.session.commit()
         flash('User created successfully!', 'success')

src/routes/process.py

@@ -4,7 +4,7 @@
 from src.config import app
 from src.utils import get_top_processes, render_template_from_file
 from src.models import DashboardSettings
-from src.scripts.email_me import send_email
+from src.scripts.email_me import send_smpt_email
 
 process_bp = blueprints.Blueprint("process", __name__)
 
@@ -36,7 +36,7 @@ def process():
                 subject = f"Process '{process_name}' (PID {pid_to_kill}) killed successfully."
                 context = {"process_name": process_name, "pid_to_kill": pid_to_kill, "username": current_user.username}
                 html_body = render_template_from_file("src/templates/email_templates/process_killed.html", **context)
-                send_email(receiver_email, subject, html_body, is_html=True)
+                send_smpt_email(receiver_email, subject, html_body, is_html=True)
             except Exception as e:
                 flash(f"Failed to kill process '{process_name}' (PID {pid_to_kill}). Error: {e}", "danger")
             return redirect(url_for("process"))  # Refresh the page after killing process

src/routes/settings.py

@@ -4,7 +4,7 @@
 from src.models import DashboardSettings, User
 from flask_login import login_required, current_user
 from src.utils import render_template_from_file
-from src.scripts.email_me import send_email
+from src.scripts.email_me import send_smpt_email
 
 settings_bp = blueprints.Blueprint("settings", __name__)
 
@@ -40,7 +40,7 @@ def general_settings():
             }
             html_body = render_template_from_file("src/templates/email_templates/notification_alert.html", **context)
             print("Notification enabled:", settings.enable_alerts)
-            send_email(admin_emails, subject, html_body, is_html=True, bypass_alerts=True)
+            send_smpt_email(admin_emails, subject, html_body, is_html=True, bypass_alerts=True)
         db.session.commit()
         flash('General settings updated successfully!', 'success')
         return redirect(url_for('general_settings'))

src/routes/speedtest.py

@@ -4,7 +4,7 @@
 from src.config import app, db
 from src.models import DashboardSettings, SpeedTestResult
 from src.utils import run_speedtest, render_template_from_file
-from src.scripts.email_me import send_email
+from src.scripts.email_me import send_smpt_email
 
 speedtest_bp = blueprints.Blueprint("speedtest", __name__)
 
@@ -40,7 +40,7 @@ def speedtest():
             subject = "Speedtest Result"
             context = {"speedtest_result": speedtest_result}
             body = render_template_from_file("src/templates/email_templates/speedtest_result.html", **context)
-            send_email(receiver_email, subject, body, is_html=True)
+            send_smpt_email(receiver_email, subject, body, is_html=True)
             return render_template(
                 "speedtest_result.html",
                 speedtest_result=speedtest_result,

src/scripts/battery_tracking.py

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

src/scripts/email_me.py

@@ -10,7 +10,7 @@
 
 system_name = os.uname().sysname
 
-def send_email(receiver_email, subject, body, attachment_path=None, is_html=False, bypass_alerts=False):
+def send_smpt_email(receiver_email, subject, body, attachment_path=None, is_html=False, bypass_alerts=False):
 
     if isinstance(receiver_email, str):
         receiver_email = [receiver_email]  # Convert single address to list

src/static/css/signup.css

@@ -1,68 +1,64 @@
 .signup-container {
-    max-width: 400px;
-    margin: 0 auto;
-    padding: 20px;
-    background-color: #f8f9fa;
+    max-width: 600px;
+    margin: 50px auto;
+    background-color: #ffffff;
+    border: 1px solid #ddd;
     border-radius: 8px;
+    padding: 20px;
     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-    text-align: center;
-    margin-top: 50px;
 }
 
 .signup-title {
     font-size: 24px;
-    color: #343a40;
+    font-weight: bold;
     margin-bottom: 20px;
+    text-align: center;
 }
 
 .signup-form {
     display: flex;
     flex-direction: column;
-    gap: 15px;
 }
 
 .form-group {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
     margin-bottom: 15px;
 }
 
 .form-group label {
-    font-weight: 600;
-    color: #495057;
+    display: block;
+    font-weight: bold;
     margin-bottom: 5px;
 }
 
-.form-group input {
-    padding: 10px;
-    border: 1px solid #ced4da;
-    border-radius: 4px;
-    background-color: #ffffff;
-    font-size: 16px;
+.form-group input,
+.form-group select {
     width: 100%;
+    padding: 8px;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+}
+
+.form-group input[type="checkbox"] {
+    width: auto;
 }
 
 .btn-primary {
-    padding: 10px 20px;
     background-color: #007bff;
     color: #ffffff;
+    padding: 10px;
     border: none;
     border-radius: 4px;
     cursor: pointer;
-    font-size: 16px;
     text-align: center;
-    transition: background-color 0.3s ease;
 }
 
 .btn-primary:hover {
     background-color: #0056b3;
 }
 
 .login-link {
+    text-align: center;
     margin-top: 20px;
-    font-size: 14px;
-    color: #6c757d;
 }
 
 .login-link a {

src/templates/base.html

@@ -13,9 +13,11 @@
     {% block extra_head %}{% endblock %}
 </head>
 
-<body>{% include 'ext/navbar.html' %} <div class="container">{% block content %}{% endblock %} </div>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
+<body>{% include 'ext/navbar.html' %} 
+    <div class="container">{% block content %}{% endblock %} </div>
+    <!-- jQuery -->
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.bundle.min.js"></script>
     <script src="{{ url_for('static', filename='js/script.js')}}"></script>
     {% block extra_scripts %}{% endblock %}
 </body>