feat: Add "Add New User" button to view_users page

Author: codeperfectplus

app.py

@@ -1,5 +1,9 @@
-from src.config import app, db
+import datetime
+from src.config import app
 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
 
 def register_routes():
     app.register_blueprint(routes.homepage_bp)
@@ -12,9 +16,31 @@ def register_routes():
     app.register_blueprint(routes.speedtest_bp)
     app.register_blueprint(routes.process_bp)
 
+app.config['is_server_up_email_sent'] = False
+
+def server_up_email():
+    with app.app_context():
+        admin_emails = [user.email for user in User.query.filter_by(user_level="admin", receive_email_alerts=True).all()]
+        if admin_emails:
+            subject = "SystemGuard Server Started"
+            context = {
+                "current_time": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+                "cpu_usage": cpu_usage_percent(),
+                "memory_usage": get_memory_percent(),
+                "app_memory_usage": get_flask_memory_usage(),
+
+            }
+            html_body = render_template_from_file("src/templates/email_templates/server_up.html", **context)
+            # send_email(admin_emails, subject, html_body, is_html=True)
+            print("Server up email sent to", admin_emails)
+
 
 if __name__ == "__main__":
     register_routes()
+    # TODO: fix this email alert sent twice
+    # if not app.config['is_server_up_email_sent']:
+    #     app.config['is_server_up_email_sent'] = True
+    #     server_up_email()
 
     # # Start the memory-consuming program in a separate thread
     # memory_thread = threading.Thread(target=memory_consuming_program, daemon=True)

src/config.py

@@ -10,3 +10,7 @@
 
 # Initialize the database
 db = SQLAlchemy(app)
+
+@app.cli.command("run")
+def server_start():
+    print("Server started")

src/routes/auth.py

@@ -292,5 +292,30 @@ def terminal():
             return jsonify(output=output)
     return render_template('terminal.html')
 
-if __name__ == '__main__':
-    app.run(debug=True)
+@app.route('/add_user', methods=['GET', 'POST'])
+def add_user():
+    if request.method == 'POST':
+        username = request.form['username']
+        email = request.form['email']
+        password = request.form['password']
+        user_level = request.form.get('user_level', 'user')
+        receive_email_alerts = request.form.get('receive_email_alerts', 'on') == 'on'
+
+        # Check if user already exists
+        if User.query.filter_by(username=username).first() or User.query.filter_by(email=email).first():
+            flash('Username or email already exists.', 'danger')
+            return redirect(url_for('add_user'))
+
+        new_user = User(
+            username=username,
+            email=email,
+            password=generate_password_hash(password),
+            user_level=user_level,
+            receive_email_alerts=receive_email_alerts
+        )
+        db.session.add(new_user)
+        db.session.commit()
+        flash('User created successfully!', 'success')
+        return redirect(url_for('view_users'))
+
+    return render_template('add_user.html')

src/routes/settings.py

@@ -1,7 +1,10 @@
+import datetime
 from flask import render_template, request, flash, blueprints, redirect, url_for
 from src.config import app, db
-from src.models import DashboardSettings
+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
 
 settings_bp = blueprints.Blueprint("settings", __name__)
 
@@ -27,6 +30,17 @@ def general_settings():
         settings.timezone = request.form.get('timezone')
         settings.enable_cache = 'enable_cache' in request.form
         settings.enable_alerts = 'enable_alerts' in request.form
+        admin_emails = [user.email for user in User.query.filter_by(user_level="admin", receive_email_alerts=True).all()]
+        if admin_emails:
+            subject = "SystemGuard Server Started"
+            context = {
+                "current_time": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+                "notifications_enabled": settings.enable_alerts,
+                "current_user": current_user.username
+            }
+            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)
         db.session.commit()
         flash('General settings updated successfully!', 'success')
         return redirect(url_for('general_settings'))

src/scripts/email_me.py

@@ -8,20 +8,23 @@
 from src.config import app
 from src.models import SmptEamilPasswordConfig, DashboardSettings
 
-def send_email(receiver_email, subject, body, attachment_path=None, is_html=False):
+system_name = os.uname().sysname
+
+def send_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
 
     with app.app_context():
-        dashboard_settings = DashboardSettings.query.first()
-        if dashboard_settings:
-            enable_alerts = dashboard_settings.enable_alerts
-            if not enable_alerts:
-                print("Email alerts are disabled. Please enable them in the settings.")
-                flash("Email alerts are disabled. Please enable them in the settings.", "danger")
-                return redirect(url_for('general_settings'))
-   
+        if not bypass_alerts:
+            dashboard_settings = DashboardSettings.query.first()
+            if dashboard_settings:
+                enable_alerts = dashboard_settings.enable_alerts
+                if not enable_alerts:
+                    print("Email alerts are disabled. Please enable them in the settings.")
+                    flash("Email alerts are disabled. Please enable them in the settings.", "danger")
+                    return redirect(url_for('general_settings'))
+    
         email_password = SmptEamilPasswordConfig.query.first()
         if not email_password:
             print("SMTP email credentials not found. Please set EMAIL_ADDRESS and EMAIL_PASSWORD environment variables.")
@@ -35,11 +38,12 @@ def send_email(receiver_email, subject, body, attachment_path=None, is_html=Fals
 
     for email in receiver_email:
         try:
+            server_name = os.uname().nodename
             # Create a multipart message
             msg = MIMEMultipart()
             msg['From'] = EMAIL_ADDRESS
             msg['To'] = email
-            msg['Subject'] = "SystemGuard Alert:" + subject
+            msg['Subject'] = "SystemGuard Alert from " + system_name + " (" + server_name + "): " + subject
             # Append message to the body
             append_message = "This is an automated email from the SystemGuard application. Please do not reply to this email."
 

src/static/css/add_user.css

@@ -0,0 +1,62 @@
+/* add_user.css */
+
+.add-user-container {
+    padding: 30px;
+    max-width: 600px;
+    margin: 0 auto;
+    background-color: #ffffff;
+    border: 1px solid #ddd;
+    border-radius: 8px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+}
+
+.page-title {
+    margin-bottom: 20px;
+    font-size: 28px;
+    font-weight: bold;
+    color: #333;
+    text-align: center;
+}
+
+form {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+}
+
+label {
+    font-size: 16px;
+    color: #333;
+}
+
+input[type="text"],
+input[type="email"],
+input[type="password"],
+select {
+    font-size: 16px;
+    padding: 10px;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+input[type="checkbox"] {
+    margin-right: 10px;
+}
+
+button {
+    background-color: #007bff;
+    color: white;
+    padding: 12px;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    font-size: 16px;
+    transition: background-color 0.3s ease;
+    width: 100%;
+}
+
+button:hover {
+    background-color: #0056b3;
+}

src/static/css/view_users.css

@@ -1,11 +1,39 @@
+/* view_users.css */
+
 .view-users-container {
     padding: 20px;
+    max-width: 1200px;
+    margin: 0 auto;
+    background-color: #ffffff;
+    border: 1px solid #ddd;
+    border-radius: 8px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
 }
 
 .page-title {
     margin-bottom: 20px;
     font-size: 24px;
     font-weight: bold;
+    color: #333;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.btn-add-user {
+    background-color: #28a745;
+    color: white;
+    padding: 10px 20px;
+    text-decoration: none;
+    border-radius: 4px;
+    font-size: 16px;
+    display: inline-block;
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
+.btn-add-user:hover {
+    background-color: #218838;
 }
 
 .user-table {
@@ -15,18 +43,23 @@
 
 .user-table th, .user-table td {
     border: 1px solid #ddd;
-    padding: 8px;
+    padding: 12px;
+    text-align: left;
 }
 
 .user-table th {
     background-color: #f4f4f4;
-    text-align: left;
+    font-weight: bold;
 }
 
 .user-table tr:nth-child(even) {
     background-color: #f9f9f9;
 }
 
+.user-table tr:hover {
+    background-color: #f1f1f1;
+}
+
 .btn-edit {
     background-color: #007bff;
     color: white;
@@ -46,6 +79,7 @@
     border: none;
     border-radius: 4px;
     cursor: pointer;
+    font-size: 14px;
 }
 
 .btn-delete:hover {

src/templates/add_user.html

@@ -0,0 +1,31 @@
+{% extends 'base.html' %}
+{% block title %}Add New User{% endblock %}
+{% block extra_head %}
+<link rel="stylesheet" href="{{ url_for('static', filename='css/add_user.css') }}">
+{% endblock %}
+{% block content %}
+<div class="add-user-container">
+    <h2 class="page-title">Add New User</h2>
+    <form action="{{ url_for('add_user') }}" method="post">
+        <label for="username">Username:</label>
+        <input type="text" id="username" name="username" required>
+
+        <label for="email">Email:</label>
+        <input type="email" id="email" name="email" required>
+
+        <label for="password">Password:</label>
+        <input type="password" id="password" name="password" required>
+
+        <label for="user_level">User Level:</label>
+        <select id="user_level" name="user_level">
+            <option value="user">User</option>
+            <option value="admin">Admin</option>
+        </select>
+
+        <label for="receive_email_alerts">Receive Email Alerts:</label>
+        <input type="checkbox" id="receive_email_alerts" name="receive_email_alerts" checked>
+
+        <button type="submit">Add User</button>
+    </form>
+</div>
+{% endblock %}

src/templates/email_templates/admin_login_alert.html

@@ -81,7 +81,7 @@ <h2>User Login Detected</h2>
         </div>
         <div class="footer">
             <p>Thank you for using SystemGuard!</p>
-            <p>If you have any questions, feel free to <a href="mailto:support@systemguard.com">contact us</a>.</p>
+            <p>If you have any questions, feel free to <a href="mailto:codeperfectplus@gmail.com">contact us</a>.</p>
         </div>
     </div>
 </body>

src/templates/email_templates/login.html

@@ -51,9 +51,6 @@
             Hello {{ username }},<br><br>
             We noticed a login to your account on {{ login_time }}, This is a Notification that your account was accessed.
         </div>
-        <div class="alert-footer">
-            <a href="{{ url_for('reset_password') }}">Reset Password</a>
-        </div>
     </div>
 </body>