Christian Krakau-Louis
690065f788
- Added OAuth login functionality using Authentik, allowing users to log in via OpenID. - Updated user registration and login processes to handle OAuth users. - Enhanced team management features, including joining and leaving teams, and displaying user-specific team information. - Improved error handling and user feedback for team actions. - Added new database migrations for OAuth-related fields in the users table. - Updated templates to reflect changes in user authentication and team management. - Refactored dashboard and leaderboard views to include user context and team memberships.
115 lines
4.5 KiB
Python
115 lines
4.5 KiB
Python
#!/usr/bin/env python3
|
|
from fastapi import APIRouter, Request, Depends, HTTPException
|
|
from sqlalchemy.orm import Session
|
|
from sqlalchemy.sql import func
|
|
from fastapi.responses import HTMLResponse, RedirectResponse
|
|
|
|
from ..db import get_db
|
|
from ..templates_config import templates
|
|
from .. import models
|
|
|
|
router = APIRouter()
|
|
|
|
@router.get("/")
|
|
def user_dashboard(request: Request, db: Session = Depends(get_db)):
|
|
"""User dashboard showing teams, events and stats"""
|
|
try:
|
|
# Get user ID from session instead of using hardcoded admin
|
|
user_id = request.session.get("user_id")
|
|
if not user_id:
|
|
# Redirect to login if not authenticated
|
|
return RedirectResponse("/auth/login", status_code=303)
|
|
|
|
# Fetch user data from the database using session user ID
|
|
user = db.query(models.User).get(user_id)
|
|
if not user:
|
|
raise HTTPException(status_code=404, detail="User not found")
|
|
|
|
# Initialize default values in case of errors
|
|
team_count = 0
|
|
total_points = 0
|
|
event_count = 0
|
|
recent_events = []
|
|
user_teams = []
|
|
|
|
# Get team memberships - check both TeamMember and TeamMembership models
|
|
if hasattr(models, "TeamMembership"):
|
|
# Primary check - use TeamMembership model
|
|
team_count = db.query(func.count(models.TeamMembership.team_id))\
|
|
.filter(models.TeamMembership.user_id == user_id)\
|
|
.scalar() or 0
|
|
|
|
# Get user teams
|
|
user_teams = db.query(models.Team)\
|
|
.join(models.TeamMembership)\
|
|
.filter(models.TeamMembership.user_id == user_id)\
|
|
.all()
|
|
elif hasattr(models, "TeamMember"):
|
|
# Fallback to TeamMember model if TeamMembership doesn't exist
|
|
team_count = db.query(func.count(models.TeamMember.team_id))\
|
|
.filter(models.TeamMember.user_id == user_id)\
|
|
.scalar() or 0
|
|
|
|
# Get user teams
|
|
user_teams = db.query(models.Team)\
|
|
.join(models.TeamMember)\
|
|
.filter(models.TeamMember.user_id == user_id)\
|
|
.all()
|
|
|
|
# Get total points from QRCode redemptions
|
|
# First try directly from QRCodes tied to user
|
|
total_points_result = db.query(func.sum(models.QRCode.points))\
|
|
.filter(models.QRCode.redeemed_by == user_id, models.QRCode.used == True)\
|
|
.first()
|
|
|
|
if total_points_result and total_points_result[0]:
|
|
total_points = total_points_result[0]
|
|
else:
|
|
# Fallback to UserPoints model if available
|
|
if hasattr(models, "UserPoints"):
|
|
points_result = db.query(func.sum(models.UserPoints.points))\
|
|
.filter(models.UserPoints.user_id == user_id)\
|
|
.first()
|
|
|
|
if points_result and points_result[0]:
|
|
total_points = points_result[0]
|
|
|
|
# Check if EventAttendee model exists before querying
|
|
if hasattr(models, "EventAttendee") and hasattr(models, "Event"):
|
|
# Get event count safely
|
|
event_count_result = db.query(func.count(models.EventAttendee.event_id))\
|
|
.filter(models.EventAttendee.user_id == user_id)\
|
|
.first()
|
|
|
|
if event_count_result and event_count_result[0]:
|
|
event_count = event_count_result[0]
|
|
|
|
# Recent events - only if both models exist
|
|
recent_events = db.query(models.Event)\
|
|
.join(models.EventAttendee)\
|
|
.filter(models.EventAttendee.user_id == user_id)\
|
|
.order_by(models.Event.event_date.desc())\
|
|
.limit(5)\
|
|
.all()
|
|
|
|
return templates.TemplateResponse(
|
|
"dashboard/index.html",
|
|
{
|
|
"request": request,
|
|
"user": user,
|
|
"team_count": team_count,
|
|
"total_points": total_points,
|
|
"event_count": event_count,
|
|
"recent_events": recent_events,
|
|
"user_teams": user_teams
|
|
}
|
|
)
|
|
except Exception as e:
|
|
print(f"Dashboard error: {str(e)}")
|
|
raise HTTPException(status_code=500, detail=f"Dashboard error: {str(e)}")
|
|
|
|
@router.get("/scan", response_class=HTMLResponse)
|
|
def scan_qr_page(request: Request):
|
|
"""Render the QR code scanning page."""
|
|
return templates.TemplateResponse("scan_qr.html", {"request": request})
|