Kobe/docupulse
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some issues with profile and events

Browse Source
This commit is contained in:
Kobe
2025-05-29 22:40:59 +02:00
parent 8f24e21d5d
commit 37fcc5f34c
7 changed files with 79 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app.py
View File

@@ -35,7 +35,7 @@ def create_app():
@app.context_processor
def inject_csrf_token():
return dict(csrf_token=generate_csrf())
return dict(csrf_token=lambda: generate_csrf())
@app.context_processor
def inject_config():

BIN
routes/__pycache__/main.cpython-313.pyc
View File

Binary file not shown.

48
routes/main.py
View File

@@ -270,8 +270,12 @@ def init_routes(main_bp):
@require_password_change
def profile():
if request.method == 'POST':
logger.debug(f"Profile form submitted with data: {request.form}")
logger.debug(f"Files in request: {request.files}")
# Handle profile picture removal
if 'remove_picture' in request.form:
logger.debug("Removing profile picture")
if current_user.profile_picture:
# Delete the old profile picture file
old_picture_path = os.path.join(UPLOAD_FOLDER, current_user.profile_picture)
@@ -283,6 +287,7 @@ def init_routes(main_bp):
return redirect(url_for('main.profile'))
new_email = request.form.get('email')
logger.debug(f"New email: {new_email}")
# Check if the new email is already used by another user
if new_email != current_user.email:
existing_user = User.query.filter_by(email=new_email).first()
@@ -292,6 +297,7 @@ def init_routes(main_bp):
# Handle profile picture upload
file = request.files.get('profile_picture')
if file and file.filename:
logger.debug(f"Uploading new profile picture: {file.filename}")
filename = secure_filename(file.filename)
file_path = os.path.join(UPLOAD_FOLDER, filename)
file.save(file_path)
@@ -304,22 +310,62 @@ def init_routes(main_bp):
current_user.company = request.form.get('company')
current_user.position = request.form.get('position')
current_user.notes = request.form.get('notes')
logger.debug(f"Updated user data: username={current_user.username}, last_name={current_user.last_name}, email={current_user.email}")
# Handle password change if provided
new_password = request.form.get('new_password')
confirm_password = request.form.get('confirm_password')
if new_password:
if not confirm_password:
flash('Please confirm your new password.', 'error')
return render_template('profile/profile.html')
if new_password != confirm_password:
flash('Passwords do not match.', 'error')
return render_template('profile/profile.html')
current_user.set_password(new_password)
flash('Password updated successfully.', 'success')
elif confirm_password:
flash('Please enter a new password.', 'error')
return render_template('profile/profile.html')
try:
db.session.commit()
logger.debug("Profile changes committed to database")
# Log profile update event
event_details = {
'user_id': current_user.id,
'email': current_user.email,
'update_type': 'profile_update',
'updated_fields': {
'username': current_user.username,
'last_name': current_user.last_name,
'email': current_user.email,
'phone': current_user.phone,
'company': current_user.company,
'position': current_user.position,
'notes': current_user.notes,
'profile_picture': bool(current_user.profile_picture)
},
'changes': {
'username': request.form.get('first_name'),
'last_name': request.form.get('last_name'),
'email': request.form.get('email'),
'phone': request.form.get('phone'),
'company': request.form.get('company'),
'position': request.form.get('position'),
'notes': request.form.get('notes'),
'password_changed': bool(new_password)
}
}
logger.debug(f"Creating profile update event with details: {event_details}")
event = log_event('user_update', event_details, current_user.id)
logger.debug(f"Event created successfully with ID: {event.id}")
flash('Profile updated successfully!', 'success')
except Exception as e:
logger.error(f"Error updating profile or logging event: {str(e)}")
db.session.rollback()
flash('An error occurred while updating your profile.', 'error')
return redirect(url_for('main.profile'))
return redirect(url_for('main.dashboard'))
return render_template('profile/profile.html')
@main_bp.route('/starred')

5
templates/profile/profile.html
View File

@@ -6,6 +6,7 @@
<div class="container mx-auto px-4 py-6">
<div class="max-w-3xl mx-auto">
<form method="POST" enctype="multipart/form-data" class="bg-white rounded-lg shadow overflow-hidden">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
<!-- Profile Picture Section -->
<div class="p-4 border-b border-gray-200">
<div class="flex flex-col items-center">
@@ -93,8 +94,8 @@
<button type="submit"
class="text-white px-6 py-2 rounded-lg transition duration-200"
style="background-color: var(--primary-color); border: 1px solid var(--primary-color);"
onmouseover="this.style.backgroundColor='#1a8a90'"
onmouseout="this.style.backgroundColor='#16767b'">
onmouseover="this.style.backgroundColor='var(--primary-light)'"
onmouseout="this.style.backgroundColor='var(--primary-color)'">
Save Changes
</button>
</div>

4
templates/settings/tabs/events.html
View File

@@ -42,7 +42,7 @@
<select id="userFilter" class="form-select form-select-sm">
<option value="">All Users</option>
{% for user in users %}
<option value="{{ user.id }}">{{ user.username }}</option>
<option value="{{ user.id }}">{{ user.username }} {{ user.last_name }}</option>
{% endfor %}
</select>
<button id="applyFilters" class="btn btn-primary btn-sm">Apply Filters</button>
@@ -122,7 +122,7 @@
<span class="badge bg-secondary">{{ event.event_type }}</span>
{% endif %}
</td>
<td>{{ event.user.username if event.user else 'Unknown' }}</td>
<td>{{ event.user.username }} {{ event.user.last_name if event.user else 'Unknown' }}</td>
<td>
<button class="btn btn-sm btn-outline-secondary"
data-bs-toggle="modal"

BIN
utils/__pycache__/event_logger.cpython-313.pyc
View File

Binary file not shown.

36
utils/event_logger.py
View File

@@ -4,6 +4,9 @@ from typing import Optional, Dict, Any, List
from datetime import datetime
from flask_login import current_user
from sqlalchemy import desc
import logging
logger = logging.getLogger(__name__)
def log_event(event_type: str, details: Optional[Dict[str, Any]] = None, user_id: Optional[int] = None) -> Event:
"""
@@ -17,21 +20,32 @@ def log_event(event_type: str, details: Optional[Dict[str, Any]] = None, user_id
Returns:
The created Event object
"""
logger.debug(f"Creating event of type: {event_type}")
logger.debug(f"Event details: {details}")
if user_id is None and current_user.is_authenticated:
user_id = current_user.id
logger.debug(f"Using current user ID: {user_id}")
event = Event(
event_type=event_type,
user_id=user_id,
timestamp=datetime.utcnow(),
details=details or {},
ip_address=request.remote_addr if request else None,
user_agent=request.user_agent.string if request and request.user_agent else None
)
try:
event = Event(
event_type=event_type,
user_id=user_id,
timestamp=datetime.utcnow(),
details=details or {},
ip_address=request.remote_addr if request else None,
user_agent=request.user_agent.string if request and request.user_agent else None
)
db.session.add(event)
db.session.commit()
return event
logger.debug(f"Created event object: {event}")
db.session.add(event)
db.session.commit()
logger.debug(f"Event saved to database with ID: {event.id}")
return event
except Exception as e:
logger.error(f"Error creating event: {str(e)}")
db.session.rollback()
raise
def get_user_events(user_id: int, limit: int = 50) -> List[Event]:
"""Get recent events for a specific user"""