up

admin.py

@@ -0,0 +1,260 @@
+from fastapi import APIRouter, Depends, HTTPException, Request, Form, Query, status
+from fastapi.responses import HTMLResponse, RedirectResponse
+from sqlalchemy.orm import Session
+from models import User, Device, SystemSetting, StatusRecord
+from database import get_db
+from datetime import datetime
+from typing import Optional
+from fastapi.templating import Jinja2Templates
+
+admin_router = APIRouter(prefix="/admin", tags=["admin"])
+templates = Jinja2Templates(directory="templates")
+
+def login_required(request: Request, db: Session = Depends(get_db)):
+    username = request.cookies.get("username")
+    if not username:
+        return RedirectResponse(url="/login", status_code=status.HTTP_302_FOUND)
+    user = db.query(User).filter(User.username == username).first()
+    if not user:
+        return RedirectResponse(url="/login", status_code=status.HTTP_302_FOUND)
+    return user
+
+@admin_router.get("", response_class=HTMLResponse)
+async def admin_page(request: Request, db: Session = Depends(get_db)):
+    current_user = login_required(request, db)
+    if isinstance(current_user, RedirectResponse):
+        return current_user
+    if not current_user.is_admin:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
+        )
+    users = db.query(User).all()
+    devices = db.query(Device).all()
+    system_setting = db.query(SystemSetting).first()
+    return templates.TemplateResponse(
+        "admin.html", {
+            "request": request, 
+            "users": users, 
+            "devices": devices, 
+            "system_setting": system_setting,
+            "current_user": current_user
+        }
+    )
+
+@admin_router.post("/edit_system_setting")
+async def edit_system_setting(
+    request: Request,
+    check_connect_period: int = Form(...),
+    data_sync_period: int = Form(...),
+    get_config_period: int = Form(...),
+    point_distance: int = Form(...),
+    db: Session = Depends(get_db),
+):
+    current_user = login_required(request, db)
+    if isinstance(current_user, RedirectResponse):
+        return current_user
+    if not current_user.is_admin:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
+        )
+
+    system_setting = db.query(SystemSetting).first()
+    if not system_setting:
+        system_setting = SystemSetting()
+        db.add(system_setting)
+
+    system_setting.check_connect_period = check_connect_period
+    system_setting.data_sync_period = data_sync_period
+    system_setting.get_config_period = get_config_period
+    system_setting.point_distance = point_distance
+
+    db.commit()
+    return RedirectResponse(url="/admin", status_code=status.HTTP_302_FOUND)
+
+@admin_router.get("/data", response_class=HTMLResponse, name="admin_data")
+async def admin_data(
+    request: Request,
+    start_date: Optional[str] = Query(None),
+    end_date: Optional[str] = Query(None),
+    device_id: Optional[str] = Query(None),
+    page: int = Query(1, ge=1),
+    per_page: int = Query(10, ge=10, le=100),
+    db: Session = Depends(get_db)
+):
+    current_user = login_required(request, db)
+    if isinstance(current_user, RedirectResponse):
+        return current_user
+    if not current_user.is_admin:
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized")
+
+    query = db.query(StatusRecord)
+    
+    if start_date:
+        query = query.filter(StatusRecord.timestamp >= datetime.strptime(start_date, "%Y-%m-%d"))
+    if end_date:
+        query = query.filter(StatusRecord.timestamp <= datetime.strptime(end_date, "%Y-%m-%d"))
+    if device_id:
+        query = query.filter(StatusRecord.device_id == device_id)
+
+    total_records = query.count()
+    total_pages = (total_records + per_page - 1) // per_page
+
+    records = query.order_by(StatusRecord.timestamp.desc()).offset((page - 1) * per_page).limit(per_page).all()
+    
+    devices = db.query(Device.device_id).distinct().all()
+    device_ids = [device.device_id for device in devices]
+
+    # Tính toán phạm vi trang để hiển thị
+    page_range = 5
+    start_page = max(1, page - page_range // 2)
+    end_page = min(total_pages, start_page + page_range - 1)
+    start_page = max(1, end_page - page_range + 1)
+
+    return templates.TemplateResponse(
+        "admin_data.html",
+        {
+            "request": request,
+            "records": records,
+            "current_page": page,
+            "total_pages": total_pages,
+            "start_page": start_page,
+            "end_page": end_page,
+            "start_date": start_date,
+            "end_date": end_date,
+            "device_id": device_id,
+            "device_ids": device_ids,
+            "current_user": current_user,
+            "per_page": per_page,
+        }
+    )
+
+@admin_router.post("/delete/{username}")
+async def delete_user(request: Request, username: str, db: Session = Depends(get_db)):
+    current_user = login_required(request, db)
+    if isinstance(current_user, RedirectResponse):
+        return current_user
+    if not current_user.is_admin:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
+        )
+    user = db.query(User).filter(User.username == username).first()
+    if user:
+        db.delete(user)
+        db.commit()
+    return RedirectResponse(url="/admin", status_code=status.HTTP_302_FOUND)
+
+
+@admin_router.post("/edit/{username}")
+async def edit_user(
+    request: Request,
+    username: str,
+    new_username: str = Form(...),
+    email: str = Form(...),
+    is_admin: bool = Form(False),
+    is_active: bool = Form(False),
+    db: Session = Depends(get_db),
+):
+    current_user = login_required(request, db)
+    if isinstance(current_user, RedirectResponse):
+        return current_user
+    if not current_user.is_admin:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
+        )
+    user = db.query(User).filter(User.username == username).first()
+    if user:
+        if (
+            new_username != username
+            and db.query(User).filter(User.username == new_username).first()
+        ):
+            raise HTTPException(status_code=400, detail="Username already exists")
+        user.username = new_username
+        user.email = email
+        user.is_admin = is_admin
+        user.is_active = is_active
+        db.commit()
+    return RedirectResponse(url="/admin", status_code=status.HTTP_302_FOUND)
+
+
+@admin_router.post("/add_device")
+async def add_device(
+    request: Request,
+    name: str = Form(...),
+    description: str = Form(...),
+    device_id: str = Form(...),
+    password: str = Form(...),
+    db: Session = Depends(get_db),
+):
+    current_user = login_required(request, db)
+    if isinstance(current_user, RedirectResponse):
+        return current_user
+    if not current_user.is_admin:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
+        )
+
+    existing_device = db.query(Device).filter(Device.device_id == device_id).first()
+    if existing_device:
+        raise HTTPException(status_code=400, detail="Device ID already exists")
+
+    new_device = Device(
+        name=name, description=description, device_id=device_id, password=password
+    )
+    db.add(new_device)
+    db.commit()
+    return RedirectResponse(url="/admin", status_code=status.HTTP_302_FOUND)
+
+
+@admin_router.post("/edit_device/{device_id}")
+async def edit_device(
+    request: Request,
+    device_id: str,
+    name: str = Form(...),
+    description: str = Form(...),
+    new_device_id: str = Form(...),
+    password: str = Form(...),
+    db: Session = Depends(get_db),
+):
+    current_user = login_required(request, db)
+    if isinstance(current_user, RedirectResponse):
+        return current_user
+    if not current_user.is_admin:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
+        )
+
+    device = db.query(Device).filter(Device.device_id == device_id).first()
+    if not device:
+        raise HTTPException(status_code=404, detail="Device not found")
+
+    if (
+        new_device_id != device_id
+        and db.query(Device).filter(Device.device_id == new_device_id).first()
+    ):
+        raise HTTPException(status_code=400, detail="New Device ID already exists")
+
+    device.name = name
+    device.description = description
+    device.device_id = new_device_id
+    device.password = password
+    db.commit()
+    return RedirectResponse(url="/admin", status_code=status.HTTP_302_FOUND)
+
+
+@admin_router.post("/delete_device/{device_id}")
+async def delete_device(
+    request: Request, device_id: str, db: Session = Depends(get_db)
+):
+    current_user = login_required(request, db)
+    if isinstance(current_user, RedirectResponse):
+        return current_user
+    if not current_user.is_admin:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
+        )
+
+    device = db.query(Device).filter(Device.device_id == device_id).first()
+    if device:
+        db.delete(device)
+        db.commit()
+    return RedirectResponse(url="/admin", status_code=status.HTTP_302_FOUND)

api.py

@@ -0,0 +1,224 @@
+from fastapi import APIRouter, Depends, HTTPException, Header, status
+from fastapi.responses import JSONResponse
+from sqlalchemy.orm import Session
+from models import StatusRecord, Device, StatusRecordBatch, SystemSetting
+from database import get_db
+from datetime import datetime, timedelta
+import uuid as uuid_module
+import random
+from sqlalchemy.exc import IntegrityError
+from typing import Dict
+
+api_router = APIRouter(prefix="/api", tags=["api"])
+
+def authenticate_device(device_id: str, device_password: str, db: Session = Depends(get_db)):
+    device = db.query(Device).filter(Device.device_id == device_id).first()
+    if not device or device.password != device_password:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Invalid device credentials",
+        )
+    return device
+
+@api_router.post("/generate-data")
+def generate_data(
+    device_id: str = Header(...),
+    device_password: str = Header(...),
+    db: Session = Depends(get_db),
+):
+    authenticate_device(device_id, device_password, db)
+    base_latitude = 35.6837
+    base_longitude = 139.6805
+    start_date = datetime(2024, 8, 1)
+    end_date = datetime(2024, 8, 7)
+    delta = end_date - start_date
+
+    for _ in range(100):
+        random_days = random.randint(0, delta.days)
+        random_seconds = random.randint(0, 86400)
+        random_time = start_date + timedelta(days=random_days, seconds=random_seconds)
+
+        random_latitude = base_latitude + random.uniform(-0.01, 0.01)
+        random_longitude = base_longitude + random.uniform(-0.01, 0.01)
+        random_connect_status = random.choice([0, 1])
+
+        status_record = StatusRecord(
+            device_id=device_id,
+            latitude=random_latitude,
+            longitude=random_longitude,
+            timestamp=random_time,
+            connect_status=random_connect_status,
+        )
+        db.add(status_record)
+
+    db.commit()
+    return {"message": "Demo data generated successfully"}
+
+
+@api_router.delete("/delete-data", summary="Delete all status records")
+def delete_all_data(
+    device_id: str = Header(...),
+    device_password: str = Header(...),
+    db: Session = Depends(get_db),
+):
+    """
+    Delete all status records from the database.
+    Requires device authentication.
+    """
+    authenticate_device(device_id, device_password, db)
+    try:
+        db.query(StatusRecord).delete()
+        db.commit()
+        return {"message": "All data deleted successfully"}
+    except Exception as e:
+        db.rollback()
+        raise HTTPException(status_code=500, detail=f"An error occurred: {str(e)}")
+
+
+@api_router.delete(
+    "/delete-data/{device_id}", summary="Delete status records for a specific device"
+)
+def delete_device_data(
+    device_id: str,
+    auth_device_id: str = Header(...),
+    device_password: str = Header(...),
+    db: Session = Depends(get_db),
+):
+    """
+    Delete status records for a specific device ID.
+    Requires device authentication.
+    """
+    authenticate_device(auth_device_id, device_password, db)
+    try:
+        deleted_count = (
+            db.query(StatusRecord).filter(StatusRecord.device_id == device_id).delete()
+        )
+        db.commit()
+        if deleted_count == 0:
+            return {"message": f"No data found for device ID: {device_id}"}
+        return {"message": f"Data for device ID {device_id} deleted successfully"}
+    except Exception as e:
+        db.rollback()
+        raise HTTPException(status_code=500, detail=f"An error occurred: {str(e)}")
+
+
+@api_router.post("/upload_batch")
+async def upload_data_batch(
+    records: StatusRecordBatch,
+    device_id: str = Header(...),
+    device_password: str = Header(...),
+    db: Session = Depends(get_db),
+):
+    """
+    Upload multiple status records in a single request.
+    Requires device authentication and unique UUIDs for each record.
+    Uses the device_id from the header for all records.
+    """
+    authenticate_device(device_id, device_password, db)
+
+    successful_uploads = 0
+    failed_uploads = 0
+    error_messages = []
+    failed_records = []
+
+    for record in records.records:
+        try:
+            # Validate UUID
+            uuid_obj = uuid_module.UUID(record.uuid)
+
+            # Validate timestamp
+            timestamp_dt = datetime.strptime(record.timestamp, "%Y-%m-%d %H:%M:%S")
+
+            status_record = StatusRecord(
+                uuid=str(uuid_obj),
+                device_id=device_id,
+                latitude=record.latitude,
+                longitude=record.longitude,
+                timestamp=timestamp_dt,
+                connect_status=record.connect_status,
+            )
+            db.add(status_record)
+            successful_uploads += 1
+        except ValueError as ve:
+            failed_uploads += 1
+            error_messages.append(f"Invalid data format: {str(ve)}")
+            failed_records.append(str(uuid_obj))
+        except IntegrityError:
+            db.rollback()
+            failed_uploads += 1
+            error_messages.append(f"Duplicate UUID: {record.uuid}")
+            failed_records.append(str(uuid_obj))
+        except Exception as e:
+            db.rollback()
+            failed_uploads += 1
+            error_messages.append(f"Error processing record: {str(e)}")
+            failed_records.append(str(uuid_obj))
+    try:
+        db.commit()
+    except Exception as e:
+        db.rollback()
+        return JSONResponse(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            content={"message": f"Error committing to database: {str(e)}"},
+        )
+
+    return JSONResponse(
+        status_code=status.HTTP_200_OK,
+        content={
+            "status": "ok",
+            "message": "Batch upload completed",
+            "successful_uploads": successful_uploads,
+            "failed_uploads": failed_uploads,
+            "errors": error_messages,
+            "failed_records": failed_records,
+        },
+    )
+
+
+@api_router.get("/health_check", summary="Check if the API is functioning correctly")
+def health_check(
+    device_id: str = Header(...),
+    device_password: str = Header(...),
+    db: Session = Depends(get_db),
+):
+    """
+    Perform a health check on the API.
+    Requires device authentication.
+    Returns a 200 status code if successful.
+    Returns a 401 Unauthorized error if authentication fails.
+    """
+    try:
+        authenticate_device(device_id, device_password, db)
+        return JSONResponse(content={"status": "ok"}, status_code=status.HTTP_200_OK)
+    except HTTPException as e:
+        if e.status_code == status.HTTP_401_UNAUTHORIZED:
+            return JSONResponse(
+                content={"status": "error", "detail": "Unauthorized"},
+                status_code=status.HTTP_401_UNAUTHORIZED,
+            )
+        raise e
+
+
+@api_router.get(
+    "/config", summary="Get system configuration", response_model=Dict[str, int]
+)
+def get_config(
+    device_id: str = Header(...),
+    device_password: str = Header(...),
+    db: Session = Depends(get_db),
+):
+    """
+    Retrieve the system configuration from SystemSetting.
+    Requires device authentication.
+    """
+    authenticate_device(device_id, device_password, db)
+    system_setting = db.query(SystemSetting).first()
+    if not system_setting:
+        raise HTTPException(status_code=404, detail="System settings not found")
+
+    return {
+        "check_connect_period": system_setting.check_connect_period,
+        "data_sync_period": system_setting.data_sync_period,
+        "get_config_period": system_setting.get_config_period,
+        "point_distance": system_setting.point_distance,
+    }

app.py

@@ -1,44 +1,19 @@
-from fastapi import (
-    FastAPI,
-    HTTPException,
-    Request,
-    Form,
-    Depends,
-    status,
-    APIRouter,
-    Header,
-)
-from fastapi.responses import (
-    HTMLResponse,
-    RedirectResponse,
-    JSONResponse,
-    StreamingResponse,
-)
+from fastapi import FastAPI, HTTPException, Request, Form, Depends, status, APIRouter
+from fastapi.responses import HTMLResponse, RedirectResponse, StreamingResponse
 from fastapi.templating import Jinja2Templates
-from fastapi.staticfiles import StaticFiles
 from fastapi.security import HTTPBasic
-from datetime import datetime, timedelta
-import random
+from datetime import datetime
 import folium
-import uuid as uuid_module
+
 from folium.plugins import MarkerCluster
 from typing import Optional
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker, Session
-from models import Base, User, StatusRecord, SystemSetting, Device, StatusRecordBatch
+from sqlalchemy.orm import Session
+from models import User, StatusRecord, SystemSetting, Device
 import io
 import csv
-from typing import Dict
-
-# Database setup
-SQLALCHEMY_DATABASE_URL = "sqlite:///./database.db"
-engine = create_engine(
-    SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
-)
-SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
-
-Base.metadata.create_all(bind=engine)
-
+from admin import admin_router
+from api import api_router
+from database import get_db, SessionLocal
 
 # Create default admin user and system settings
 def create_default_data():
@@ -74,19 +49,6 @@ app = FastAPI()
 templates = Jinja2Templates(directory="templates")
 security = HTTPBasic()
 
-# Create APIRouters for grouping
-admin_router = APIRouter(prefix="/admin", tags=["admin"])
-api_router = APIRouter(prefix="/api", tags=["api"])
-
-
-# Dependency to get the database session
-def get_db():
-    db = SessionLocal()
-    try:
-        yield db
-    finally:
-        db.close()
-
 
 def get_current_user(request: Request, db: Session = Depends(get_db)) -> Optional[User]:
     username = request.cookies.get("username")
@@ -104,7 +66,6 @@ def login_required(request: Request, db: Session = Depends(get_db)):
         return RedirectResponse(url="/login", status_code=status.HTTP_302_FOUND)
     return user
 
-
 # Device authentication function
 def authenticate_device(
     device_id: str, device_password: str, db: Session = Depends(get_db)
@@ -179,360 +140,6 @@ async def register(
     return RedirectResponse(url="/login", status_code=status.HTTP_302_FOUND)
 
 
-# Admin routes
-@admin_router.get("", response_class=HTMLResponse)
-async def admin_page(request: Request, db: Session = Depends(get_db)):
-    current_user = login_required(request, db)
-    if isinstance(current_user, RedirectResponse):
-        return current_user
-    if not current_user.is_admin:
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
-        )
-    users = db.query(User).all()
-    devices = db.query(Device).all()
-    return templates.TemplateResponse(
-        "admin.html", {"request": request, "users": users, "devices": devices}
-    )
-
-
-@admin_router.post("/delete/{username}")
-async def delete_user(request: Request, username: str, db: Session = Depends(get_db)):
-    current_user = login_required(request, db)
-    if isinstance(current_user, RedirectResponse):
-        return current_user
-    if not current_user.is_admin:
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
-        )
-    user = db.query(User).filter(User.username == username).first()
-    if user:
-        db.delete(user)
-        db.commit()
-    return RedirectResponse(url="/admin", status_code=status.HTTP_302_FOUND)
-
-
-@admin_router.post("/edit/{username}")
-async def edit_user(
-    request: Request,
-    username: str,
-    new_username: str = Form(...),
-    email: str = Form(...),
-    is_admin: bool = Form(False),
-    is_active: bool = Form(False),
-    db: Session = Depends(get_db),
-):
-    current_user = login_required(request, db)
-    if isinstance(current_user, RedirectResponse):
-        return current_user
-    if not current_user.is_admin:
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
-        )
-    user = db.query(User).filter(User.username == username).first()
-    if user:
-        if (
-            new_username != username
-            and db.query(User).filter(User.username == new_username).first()
-        ):
-            raise HTTPException(status_code=400, detail="Username already exists")
-        user.username = new_username
-        user.email = email
-        user.is_admin = is_admin
-        user.is_active = is_active
-        db.commit()
-    return RedirectResponse(url="/admin", status_code=status.HTTP_302_FOUND)
-
-
-@admin_router.post("/add_device")
-async def add_device(
-    request: Request,
-    name: str = Form(...),
-    description: str = Form(...),
-    device_id: str = Form(...),
-    password: str = Form(...),
-    db: Session = Depends(get_db),
-):
-    current_user = login_required(request, db)
-    if isinstance(current_user, RedirectResponse):
-        return current_user
-    if not current_user.is_admin:
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
-        )
-
-    existing_device = db.query(Device).filter(Device.device_id == device_id).first()
-    if existing_device:
-        raise HTTPException(status_code=400, detail="Device ID already exists")
-
-    new_device = Device(
-        name=name, description=description, device_id=device_id, password=password
-    )
-    db.add(new_device)
-    db.commit()
-    return RedirectResponse(url="/admin", status_code=status.HTTP_302_FOUND)
-
-
-@admin_router.post("/edit_device/{device_id}")
-async def edit_device(
-    request: Request,
-    device_id: str,
-    name: str = Form(...),
-    description: str = Form(...),
-    new_device_id: str = Form(...),
-    password: str = Form(...),
-    db: Session = Depends(get_db),
-):
-    current_user = login_required(request, db)
-    if isinstance(current_user, RedirectResponse):
-        return current_user
-    if not current_user.is_admin:
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
-        )
-
-    device = db.query(Device).filter(Device.device_id == device_id).first()
-    if not device:
-        raise HTTPException(status_code=404, detail="Device not found")
-
-    if (
-        new_device_id != device_id
-        and db.query(Device).filter(Device.device_id == new_device_id).first()
-    ):
-        raise HTTPException(status_code=400, detail="New Device ID already exists")
-
-    device.name = name
-    device.description = description
-    device.device_id = new_device_id
-    device.password = password
-    db.commit()
-    return RedirectResponse(url="/admin", status_code=status.HTTP_302_FOUND)
-
-
-@admin_router.post("/delete_device/{device_id}")
-async def delete_device(
-    request: Request, device_id: str, db: Session = Depends(get_db)
-):
-    current_user = login_required(request, db)
-    if isinstance(current_user, RedirectResponse):
-        return current_user
-    if not current_user.is_admin:
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN, detail="Not authorized"
-        )
-
-    device = db.query(Device).filter(Device.device_id == device_id).first()
-    if device:
-        db.delete(device)
-        db.commit()
-    return RedirectResponse(url="/admin", status_code=status.HTTP_302_FOUND)
-
-
-# API routes
-@api_router.post("/generate-data")
-def generate_data(
-    device_id: str = Header(...),
-    device_password: str = Header(...),
-    db: Session = Depends(get_db),
-):
-    authenticate_device(device_id, device_password, db)
-    base_latitude = 35.6837
-    base_longitude = 139.6805
-    start_date = datetime(2024, 8, 1)
-    end_date = datetime(2024, 8, 7)
-    delta = end_date - start_date
-
-    for _ in range(100):
-        random_days = random.randint(0, delta.days)
-        random_seconds = random.randint(0, 86400)
-        random_time = start_date + timedelta(days=random_days, seconds=random_seconds)
-
-        random_latitude = base_latitude + random.uniform(-0.01, 0.01)
-        random_longitude = base_longitude + random.uniform(-0.01, 0.01)
-        random_connect_status = random.choice([0, 1])
-
-        status_record = StatusRecord(
-            device_id=device_id,
-            latitude=random_latitude,
-            longitude=random_longitude,
-            timestamp=random_time,
-            connect_status=random_connect_status,
-        )
-        db.add(status_record)
-
-    db.commit()
-    return {"message": "Demo data generated successfully"}
-
-
-@api_router.delete("/delete-data", summary="Delete all status records")
-def delete_all_data(
-    device_id: str = Header(...),
-    device_password: str = Header(...),
-    db: Session = Depends(get_db),
-):
-    """
-    Delete all status records from the database.
-    Requires device authentication.
-    """
-    authenticate_device(device_id, device_password, db)
-    try:
-        db.query(StatusRecord).delete()
-        db.commit()
-        return {"message": "All data deleted successfully"}
-    except Exception as e:
-        db.rollback()
-        raise HTTPException(status_code=500, detail=f"An error occurred: {str(e)}")
-
-
-@api_router.delete(
-    "/delete-data/{device_id}", summary="Delete status records for a specific device"
-)
-def delete_device_data(
-    device_id: str,
-    auth_device_id: str = Header(...),
-    device_password: str = Header(...),
-    db: Session = Depends(get_db),
-):
-    """
-    Delete status records for a specific device ID.
-    Requires device authentication.
-    """
-    authenticate_device(auth_device_id, device_password, db)
-    try:
-        deleted_count = (
-            db.query(StatusRecord).filter(StatusRecord.device_id == device_id).delete()
-        )
-        db.commit()
-        if deleted_count == 0:
-            return {"message": f"No data found for device ID: {device_id}"}
-        return {"message": f"Data for device ID {device_id} deleted successfully"}
-    except Exception as e:
-        db.rollback()
-        raise HTTPException(status_code=500, detail=f"An error occurred: {str(e)}")
-
-
-@api_router.post("/upload_batch")
-async def upload_data_batch(
-    records: StatusRecordBatch,
-    device_id: str = Header(...),
-    device_password: str = Header(...),
-    db: Session = Depends(get_db),
-):
-    """
-    Upload multiple status records in a single request.
-    Requires device authentication and unique UUIDs for each record.
-    Uses the device_id from the header for all records.
-    """
-    authenticate_device(device_id, device_password, db)
-
-    successful_uploads = 0
-    failed_uploads = 0
-    error_messages = []
-    failed_records = []
-
-    for record in records.records:
-        try:
-            # Validate UUID
-            uuid_obj = uuid_module.UUID(record.uuid)
-
-            # Validate timestamp
-            timestamp_dt = datetime.strptime(record.timestamp, "%Y-%m-%d %H:%M:%S")
-
-            status_record = StatusRecord(
-                uuid=str(uuid_obj),
-                device_id=device_id,
-                latitude=record.latitude,
-                longitude=record.longitude,
-                timestamp=timestamp_dt,
-                connect_status=record.connect_status,
-            )
-            db.add(status_record)
-            successful_uploads += 1
-        except ValueError as ve:
-            failed_uploads += 1
-            error_messages.append(f"Invalid data format: {str(ve)}")
-            failed_records.append(str(uuid_obj))
-        except IntegrityError:
-            db.rollback()
-            failed_uploads += 1
-            error_messages.append(f"Duplicate UUID: {record.uuid}")
-            failed_records.append(str(uuid_obj))
-        except Exception as e:
-            db.rollback()
-            failed_uploads += 1
-            error_messages.append(f"Error processing record: {str(e)}")
-            failed_records.append(str(uuid_obj))
-    try:
-        db.commit()
-    except Exception as e:
-        db.rollback()
-        return JSONResponse(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            content={"message": f"Error committing to database: {str(e)}"},
-        )
-
-    return JSONResponse(
-        status_code=status.HTTP_200_OK,
-        content={
-            "status": "ok",
-            "message": "Batch upload completed",
-            "successful_uploads": successful_uploads,
-            "failed_uploads": failed_uploads,
-            "errors": error_messages,
-            "failed_records": failed_records,
-        },
-    )
-
-
-@api_router.get("/health_check", summary="Check if the API is functioning correctly")
-def health_check(
-    device_id: str = Header(...),
-    device_password: str = Header(...),
-    db: Session = Depends(get_db),
-):
-    """
-    Perform a health check on the API.
-    Requires device authentication.
-    Returns a 200 status code if successful.
-    Returns a 401 Unauthorized error if authentication fails.
-    """
-    try:
-        authenticate_device(device_id, device_password, db)
-        return JSONResponse(content={"status": "ok"}, status_code=status.HTTP_200_OK)
-    except HTTPException as e:
-        if e.status_code == status.HTTP_401_UNAUTHORIZED:
-            return JSONResponse(
-                content={"status": "error", "detail": "Unauthorized"},
-                status_code=status.HTTP_401_UNAUTHORIZED,
-            )
-        raise e
-
-
-@api_router.get(
-    "/config", summary="Get system configuration", response_model=Dict[str, int]
-)
-def get_config(
-    device_id: str = Header(...),
-    device_password: str = Header(...),
-    db: Session = Depends(get_db),
-):
-    """
-    Retrieve the system configuration from SystemSetting.
-    Requires device authentication.
-    """
-    authenticate_device(device_id, device_password, db)
-    system_setting = db.query(SystemSetting).first()
-    if not system_setting:
-        raise HTTPException(status_code=404, detail="System settings not found")
-
-    return {
-        "check_connect_period": system_setting.check_connect_period,
-        "data_sync_period": system_setting.data_sync_period,
-        "get_config_period": system_setting.get_config_period,
-        "point_distance": system_setting.point_distance,
-    }
-
-
 @app.get("/", response_class=HTMLResponse)
 def show_map(
     request: Request,
@@ -633,5 +240,4 @@ app.include_router(api_router)
 
 if __name__ == "__main__":
     import uvicorn
-
     uvicorn.run(app, host="0.0.0.0", port=7860)

database.py

@@ -0,0 +1,16 @@
+from sqlalchemy import create_engine
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import sessionmaker
+
+SQLALCHEMY_DATABASE_URL = "sqlite:///./database.db"
+engine = create_engine(SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False})
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+
+Base = declarative_base()
+
+def get_db():
+    db = SessionLocal()
+    try:
+        yield db
+    finally:
+        db.close()

models.py

@@ -1,11 +1,9 @@
-from sqlalchemy import Column, Integer, String, Float, DateTime, Boolean, Enum
-from sqlalchemy.ext.declarative import declarative_base
-from datetime import datetime
+from sqlalchemy import Column, Integer, String, Float, DateTime, Boolean
 import uuid
 from pydantic import BaseModel
 from typing import List
+from database import Base
 
-Base = declarative_base()
 
 class User(Base):
     __tablename__ = "users"

templates/admin.html

@@ -5,69 +5,175 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Admin Panel - Signal Tracker</title>
     <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet">
+    <style>
+        .user-info {
+            position: absolute;
+            top: 20px;
+            right: 20px;
+            background-color: white;
+            padding: 10px 15px;
+            border-radius: 25px;
+            box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+            display: flex;
+            align-items: center;
+            font-family: Arial, sans-serif;
+            font-size: 14px;
+        }
+        .user-info span {
+            font-weight: bold;
+            margin-right: 10px;
+        }
+        .user-info a {
+            text-decoration: none;
+            color: #007bff;
+            padding: 5px 10px;
+            border-radius: 15px;
+            transition: background-color 0.3s, color 0.3s;
+        }
+        .user-info a:hover {
+            background-color: #007bff;
+            color: white;
+        }
+        .section {
+            margin-bottom: 40px;
+        }
+        .section-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 20px;
+        }
+        .bottom-nav {
+            margin-top: 40px;
+        }
+    </style>
 </head>
 <body>
     <div class="container mt-5">
-        <h1>Admin Panel</h1>
-        <table class="table">
-            <thead>
-                <tr>
-                    <th>Username</th>
-                    <th>Email</th>
-                    <th>Is Admin</th>
-                    <th>Last Login</th>
-                    <th>Is Active</th>
-                    <th>Actions</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for user in users %}
-                <tr>
-                    <td>{{ user.username }}</td>
-                    <td>{{ user.email }}</td>
-                    <td>{{ user.is_admin }}</td>
-                    <td>{{ user.last_login.strftime('%Y-%m-%d %H:%M:%S') if user.last_login else 'Never' }}</td>
-                    <td>{{ user.is_active }}</td>
-                    <td>
-                        <button class="btn btn-sm btn-primary" onclick="editUser('{{ user.username }}', '{{ user.email }}', {{ user.is_admin | tojson }}, {{ user.is_active | tojson }})">Edit</button>
-                        <form method="post" action="/admin/delete/{{ user.username }}" style="display: inline;">
-                            <button type="submit" class="btn btn-sm btn-danger">Delete</button>
-                        </form>
-                    </td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
+        <div class="user-info">
+            <span>Welcome, {{ current_user.username }}</span>
+            <a href="/logout">Logout</a>
+        </div>
+        
+        <h1 class="mb-4">Admin Panel</h1>
+        
+        <ul class="nav nav-tabs mb-4">
+            <li class="nav-item">
+                <a class="nav-link" href="/admin/data">Data</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link active" href="/admin">Settings</a>
+            </li>
+        </ul>
+        
+        <div class="section">
+            <h2>Users</h2>
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th>Username</th>
+                        <th>Email</th>
+                        <th>Is Admin</th>
+                        <th>Last Login</th>
+                        <th>Is Active</th>
+                        <th>Actions</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for user in users %}
+                    <tr>
+                        <td>{{ user.username }}</td>
+                        <td>{{ user.email }}</td>
+                        <td>{{ user.is_admin }}</td>
+                        <td>{{ user.last_login.strftime('%Y-%m-%d %H:%M:%S') if user.last_login else 'Never' }}</td>
+                        <td>{{ user.is_active }}</td>
+                        <td>
+                            <button class="btn btn-sm btn-primary" onclick="editUser('{{ user.username }}', '{{ user.email }}', {{ user.is_admin | tojson }}, {{ user.is_active | tojson }})">Edit</button>
+                            <form method="post" action="/admin/delete/{{ user.username }}" style="display: inline;">
+                                <button type="submit" class="btn btn-sm btn-danger">Delete</button>
+                            </form>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+        
+        <div class="section">
+            <div class="section-header">
+                <h2>Devices</h2>
+                <button class="btn btn-success" onclick="addDevice()">Add Device</button>
+            </div>
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Description</th>
+                        <th>Device ID</th>
+                        <th>Password</th>
+                        <th>Actions</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for device in devices %}
+                    <tr>
+                        <td>{{ device.name }}</td>
+                        <td>{{ device.description }}</td>
+                        <td>{{ device.device_id }}</td>
+                        <td>{{ device.password }}</td>
+                        <td>
+                            <button class="btn btn-sm btn-primary" onclick="editDevice('{{ device.name }}', '{{ device.description }}', '{{ device.device_id }}', '{{ device.password }}')">Edit</button>
+                            <form method="post" action="/admin/delete_device/{{ device.device_id }}" style="display: inline;">
+                                <button type="submit" class="btn btn-sm btn-danger">Delete</button>
+                            </form>
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
         
-        <h2>Devices</h2>
-        <button class="btn btn-success mb-3" onclick="addDevice()">Add Device</button>
-        <table class="table">
-            <thead>
-                <tr>
-                    <th>Name</th>
-                    <th>Description</th>
-                    <th>Device ID</th>
-                    <th>Actions</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% for device in devices %}
-                <tr>
-                    <td>{{ device.name }}</td>
-                    <td>{{ device.description }}</td>
-                    <td>{{ device.device_id }}</td>
-                    <td>
-                        <button class="btn btn-sm btn-primary" onclick="editDevice('{{ device.name }}', '{{ device.description }}', '{{ device.device_id }}')">Edit</button>
-                        <form method="post" action="/admin/delete_device/{{ device.device_id }}" style="display: inline;">
-                            <button type="submit" class="btn btn-sm btn-danger">Delete</button>
-                        </form>
-                    </td>
-                </tr>
-                {% endfor %}
-            </tbody>
-        </table>
+        <div class="section">
+            <div class="section-header">
+                <h2>System Settings</h2>
+                <button class="btn btn-primary" onclick="editSystemSetting(
+                    {{ system_setting.check_connect_period }},
+                    {{ system_setting.data_sync_period }},
+                    {{ system_setting.get_config_period }},
+                    {{ system_setting.point_distance }}
+                )">Edit Settings</button>
+            </div>
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th>Setting</th>
+                        <th>Value</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Check Connect Period</td>
+                        <td>{{ system_setting.check_connect_period }}</td>
+                    </tr>
+                    <tr>
+                        <td>Data Sync Period</td>
+                        <td>{{ system_setting.data_sync_period }}</td>
+                    </tr>
+                    <tr>
+                        <td>Get Config Period</td>
+                        <td>{{ system_setting.get_config_period }}</td>
+                    </tr>
+                    <tr>
+                        <td>Point Distance</td>
+                        <td>{{ system_setting.point_distance }}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
         
-        <a href="/" class="btn btn-secondary">Back to Map</a>
+        <div class="bottom-nav">
+            <a href="/" class="btn btn-secondary">Back to Map</a>
+        </div>
     </div>
 
     <!-- Edit User Modal -->
@@ -180,6 +286,42 @@
         </div>
     </div>
 
+    <!-- Edit System Setting Modal -->
+    <div class="modal fade" id="editSystemSettingModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">Edit System Settings</h5>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <form id="editSystemSettingForm" method="post" action="/admin/edit_system_setting">
+                    <div class="modal-body">
+                        <div class="mb-3">
+                            <label for="checkConnectPeriod" class="form-label">Check Connect Period</label>
+                            <input type="number" class="form-control" id="checkConnectPeriod" name="check_connect_period" required>
+                        </div>
+                        <div class="mb-3">
+                            <label for="dataSyncPeriod" class="form-label">Data Sync Period</label>
+                            <input type="number" class="form-control" id="dataSyncPeriod" name="data_sync_period" required>
+                        </div>
+                        <div class="mb-3">
+                            <label for="getConfigPeriod" class="form-label">Get Config Period</label>
+                            <input type="number" class="form-control" id="getConfigPeriod" name="get_config_period" required>
+                        </div>
+                        <div class="mb-3">
+                            <label for="pointDistance" class="form-label">Point Distance</label>
+                            <input type="number" class="form-control" id="pointDistance" name="point_distance" required>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                        <button type="submit" class="btn btn-primary">Save changes</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
     <script>
         function editUser(username, email, isAdmin, isActive) {
@@ -197,15 +339,24 @@
             addDeviceModal.show();
         }
 
-        function editDevice(name, description, deviceId) {
+        function editDevice(name, description, deviceId, password) {
             document.getElementById('editDeviceForm').action = `/admin/edit_device/${deviceId}`;
             document.getElementById('editDeviceName').value = name;
             document.getElementById('editDeviceDescription').value = description;
             document.getElementById('editDeviceId').value = deviceId;
-            document.getElementById('editDevicePassword').value = ''; // Clear password field for security
+            document.getElementById('editDevicePassword').value = password; // Set the current password
             var editDeviceModal = new bootstrap.Modal(document.getElementById('editDeviceModal'));
             editDeviceModal.show();
         }
+
+        function editSystemSetting(checkConnectPeriod, dataSyncPeriod, getConfigPeriod, pointDistance) {
+            document.getElementById('checkConnectPeriod').value = checkConnectPeriod;
+            document.getElementById('dataSyncPeriod').value = dataSyncPeriod;
+            document.getElementById('getConfigPeriod').value = getConfigPeriod;
+            document.getElementById('pointDistance').value = pointDistance;
+            var editSystemSettingModal = new bootstrap.Modal(document.getElementById('editSystemSettingModal'));
+            editSystemSettingModal.show();
+        }
     </script>
 </body>
 </html>

templates/admin_data.html

@@ -0,0 +1,175 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Admin Data - Signal Tracker</title>
+    <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+    <style>
+        .user-info {
+            position: absolute;
+            top: 20px;
+            right: 20px;
+            background-color: white;
+            padding: 10px 15px;
+            border-radius: 25px;
+            box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+            display: flex;
+            align-items: center;
+            font-family: Arial, sans-serif;
+            font-size: 14px;
+        }
+        .user-info span {
+            font-weight: bold;
+            margin-right: 10px;
+        }
+        .user-info a {
+            text-decoration: none;
+            color: #007bff;
+            padding: 5px 10px;
+            border-radius: 15px;
+            transition: background-color 0.3s, color 0.3s;
+        }
+        .user-info a:hover {
+            background-color: #007bff;
+            color: white;
+        }
+        .pagination .page-link {
+            color: #007bff;
+            background-color: #fff;
+            border: 1px solid #dee2e6;
+        }
+        .pagination .page-item.active .page-link {
+            color: #fff;
+            background-color: #007bff;
+            border-color: #007bff;
+        }
+        .pagination .page-link:hover {
+            color: #0056b3;
+            background-color: #e9ecef;
+            border-color: #dee2e6;
+        }
+        .pagination .page-item.disabled .page-link {
+            color: #6c757d;
+            pointer-events: none;
+            background-color: #fff;
+            border-color: #dee2e6;
+        }
+    </style>
+</head>
+<body>
+    <div class="container mt-5">
+        <div class="user-info">
+            <span>Welcome, {{ current_user.username }}</span>
+            <a href="/logout">Logout</a>
+        </div>
+        
+        <h1 class="mb-4">Admin Panel</h1>
+        
+        <ul class="nav nav-tabs mb-4">
+            <li class="nav-item">
+                <a class="nav-link active" href="/admin/data">Data</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link" href="/admin">Settings</a>
+            </li>
+        </ul>
+
+        <form method="get" action="/admin/data" class="mb-4">
+            <div class="row g-3">
+                <div class="col-md-2">
+                    <label for="start_date" class="form-label">Start Date</label>
+                    <input type="date" class="form-control" id="start_date" name="start_date" value="{{ start_date }}" placeholder="Start Date">
+                </div>
+                <div class="col-md-2">
+                    <label for="end_date" class="form-label">End Date</label>
+                    <input type="date" class="form-control" id="end_date" name="end_date" value="{{ end_date }}" placeholder="End Date">
+                </div>
+                <div class="col-md-2">
+                    <label for="device_id" class="form-label">Device</label>
+                    <select class="form-control" id="device_id" name="device_id">
+                        <option value="">All Devices</option>
+                        {% for dev_id in device_ids %}
+                        <option value="{{ dev_id }}" {% if dev_id == device_id %}selected{% endif %}>{{ dev_id }}</option>
+                        {% endfor %}
+                    </select>
+                </div>
+                <div class="col-md-2">
+                    <label for="per_page" class="form-label">Records per page</label>
+                    <select class="form-control" id="per_page" name="per_page">
+                        <option value="10" {% if per_page == 10 or not per_page %}selected{% endif %}>10 records</option>
+                        <option value="50" {% if per_page == 50 %}selected{% endif %}>50 records</option>
+                        <option value="100" {% if per_page == 100 %}selected{% endif %}>100 records</option>
+                    </select>
+                </div>
+                <div class="col-md-2">
+                    <label class="form-label">&nbsp;</label>
+                    <button type="submit" class="btn btn-primary w-100">Filter</button>
+                </div>
+            </div>
+        </form>
+
+        <table class="table">
+            <thead>
+                <tr>
+                    <th>Device ID</th>
+                    <th>Latitude</th>
+                    <th>Longitude</th>
+                    <th>Timestamp</th>
+                    <th>Connect Status</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for record in records %}
+                <tr>
+                    <td>{{ record.device_id }}</td>
+                    <td>{{ record.latitude }}</td>
+                    <td>{{ record.longitude }}</td>
+                    <td>{{ record.timestamp }}</td>
+                    <td>{{ "Connected" if record.connect_status == 1 else "Disconnected" }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+
+        <nav aria-label="Page navigation">
+            <ul class="pagination justify-content-center">
+                <li class="page-item {% if current_page == 1 %}disabled{% endif %}">
+                    <a class="page-link" href="/admin/data?page=1&per_page={{ per_page }}{% if start_date %}&start_date={{ start_date }}{% endif %}{% if end_date %}&end_date={{ end_date }}{% endif %}{% if device_id %}&device_id={{ device_id }}{% endif %}" aria-label="First">
+                        <i class="fas fa-angle-double-left"></i>
+                    </a>
+                </li>
+                <li class="page-item {% if current_page == 1 %}disabled{% endif %}">
+                    <a class="page-link" href="/admin/data?page={{ current_page - 1 }}&per_page={{ per_page }}{% if start_date %}&start_date={{ start_date }}{% endif %}{% if end_date %}&end_date={{ end_date }}{% endif %}{% if device_id %}&device_id={{ device_id }}{% endif %}" aria-label="Previous">
+                        <i class="fas fa-angle-left"></i>
+                    </a>
+                </li>
+                
+                {% for page_num in range(start_page, end_page + 1) %}
+                <li class="page-item {% if page_num == current_page %}active{% endif %}">
+                    <a class="page-link" href="/admin/data?page={{ page_num }}&per_page={{ per_page }}{% if start_date %}&start_date={{ start_date }}{% endif %}{% if end_date %}&end_date={{ end_date }}{% endif %}{% if device_id %}&device_id={{ device_id }}{% endif %}">{{ page_num }}</a>
+                </li>
+                {% endfor %}
+                
+                <li class="page-item {% if current_page == total_pages %}disabled{% endif %}">
+                    <a class="page-link" href="/admin/data?page={{ current_page + 1 }}&per_page={{ per_page }}{% if start_date %}&start_date={{ start_date }}{% endif %}{% if end_date %}&end_date={{ end_date }}{% endif %}{% if device_id %}&device_id={{ device_id }}{% endif %}" aria-label="Next">
+                        <i class="fas fa-angle-right"></i>
+                    </a>
+                </li>
+                <li class="page-item {% if current_page == total_pages %}disabled{% endif %}">
+                    <a class="page-link" href="/admin/data?page={{ total_pages }}&per_page={{ per_page }}{% if start_date %}&start_date={{ start_date }}{% endif %}{% if end_date %}&end_date={{ end_date }}{% endif %}{% if device_id %}&device_id={{ device_id }}{% endif %}" aria-label="Last">
+                        <i class="fas fa-angle-double-right"></i>
+                    </a>
+                </li>
+            </ul>
+        </nav>
+
+        <div class="mt-4">
+            <a href="/" class="btn btn-secondary">Back to Map</a>
+        </div>
+    </div>
+
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"></script>
+</body>
+</html>

templates/map.html

@@ -61,12 +61,35 @@
         }
         .user-info {
             position: absolute;
-            top: 10px;
-            right: 10px;
+            top: 20px;
+            right: 20px;
             background-color: white;
+            padding: 10px 15px;
+            border-radius: 25px;
+            box-shadow: 0 2px 10px rgba(0,0,0,0.1);
+            display: flex;
+            align-items: center;
+            font-family: Arial, sans-serif;
+            font-size: 14px;
+        }
+        .user-info span {
+            font-weight: bold;
+            margin-right: 10px;
+        }
+        .user-info a {
+            text-decoration: none;
+            color: #007bff;
             padding: 5px 10px;
-            border-radius: 5px;
-            box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+            border-radius: 15px;
+            transition: background-color 0.3s, color 0.3s;
+        }
+        .user-info a:hover {
+            background-color: #007bff;
+            color: white;
+        }
+        .user-info .separator {
+            margin: 0 5px;
+            color: #ccc;
         }
     </style>
 </head>
@@ -74,7 +97,12 @@
     <div class="container">
         <div class="user-info">
             {% if current_user %}
-                Welcome, {{ current_user.username }} | <a href="/logout">Logout</a>
+                <span>Welcome, {{ current_user.username }}</span>
+                {% if current_user.is_admin %}
+                    <a href="/admin">Admin Panel</a>
+                    <span class="separator">|</span>
+                {% endif %}
+                <a href="/logout">Logout</a>
             {% else %}
                 <a href="/login">Login</a>
             {% endif %}