cleanup backend gui
This commit is contained in:
parent
1c0a1a0182
commit
262a31e65a
13
analytics.py
13
analytics.py
@ -145,13 +145,12 @@ def dashboard():
|
||||
|
||||
now = datetime.now()
|
||||
|
||||
# Determine which file type we're filtering by.
|
||||
# default filetype if not found
|
||||
filetype = 'other'
|
||||
|
||||
# Some simplistic sets to decide how we match the MIME type
|
||||
audio_list = ['mp3', 'wav', 'audio']
|
||||
image_list = ['jpg', 'jpeg', 'image', 'photo']
|
||||
video_list = ['mp4', 'mov', 'wmv', 'avi']
|
||||
audio_list = ['mp3', 'wav', 'ton', 'audio']
|
||||
image_list = ['jpg', 'jpeg', 'image', 'photo', 'bild', 'foto']
|
||||
video_list = ['mp4', 'mov', 'wmv', 'avi', 'film', 'video']
|
||||
|
||||
if session['filetype'].lower() in audio_list:
|
||||
filetype = 'audio/'
|
||||
@ -292,9 +291,9 @@ def dashboard():
|
||||
dict(bucket=r[0], count=r[1]) for r in timeframe_data_rows
|
||||
]
|
||||
|
||||
# 4. User agent distribution
|
||||
# 4. User agent distribution: Count user_agent once per device_id
|
||||
query = f'''
|
||||
SELECT user_agent, COUNT(*) AS count
|
||||
SELECT user_agent, COUNT(DISTINCT device_id) AS count
|
||||
FROM file_access_log
|
||||
WHERE timestamp >= ? {filetype_filter_sql}
|
||||
GROUP BY user_agent
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>Recent Connections</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
@ -11,13 +11,11 @@
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
/* Use full width */
|
||||
.container-fluid {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
/* Header area takes as much room as needed; the table container fills the rest */
|
||||
.table-container {
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
@ -25,17 +23,25 @@
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<!-- Navigation Bar -->
|
||||
<nav class="navbar navbar-expand-lg navbar-dark bg-secondary mb-3">
|
||||
<div class="container-fluid">
|
||||
<h1 class="mb-4">Downloads in den letzten 10 Minute</h1>
|
||||
<div class="mb-3">
|
||||
<a href="{{ url_for('index') }}" class="btn btn-primary mt-1">App</a>
|
||||
<a href="{{ url_for('mylinks') }}" class="btn btn-primary mt-1">Meine Links</a>
|
||||
<a href="{{ url_for('connections') }}" class="btn btn-primary mt-1">Verbindungen</a>
|
||||
<a href="{{ url_for('dashboard') }}" class="btn btn-primary mt-1">Auswertung</a>
|
||||
<a class="navbar-brand" href="#">Downloads der letzten 10 Minuten</a>
|
||||
<div class="navbar-collapse" id="navbarNav">
|
||||
<ul class="navbar-nav ms-auto">
|
||||
<li class="nav-item"><a href="{{ url_for('index') }}" class="nav-link">App</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('mylinks') }}" class="nav-link">Meine Links</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('connections') }}" class="nav-link">Verbindungen</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('dashboard') }}" class="nav-link">Auswertung</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="table-responsive table-container">
|
||||
<table class="table table-hover">
|
||||
<thead class="table-info">
|
||||
<thead class="table-secondary">
|
||||
<tr>
|
||||
<th>Timestamp</th>
|
||||
<th>IP Address</th>
|
||||
|
||||
@ -11,28 +11,39 @@
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
/* Use full width */
|
||||
.container-fluid {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
.card { margin-bottom: 20px; }
|
||||
.card {
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<body>
|
||||
<!-- Navigation Bar -->
|
||||
<nav class="navbar navbar-expand-lg navbar-dark bg-secondary mb-3">
|
||||
<div class="container-fluid">
|
||||
<h1 class="mb-4">Dashboard - Verbindungsanalyse ({{ timeframe }})</h1>
|
||||
<div class="mb-3">
|
||||
<a href="{{ url_for('index') }}" class="btn btn-primary mt-1">App</a>
|
||||
<a href="{{ url_for('mylinks') }}" class="btn btn-primary mt-1">Meine Links</a>
|
||||
<a href="{{ url_for('connections') }}" class="btn btn-primary mt-1">Verbindungen</a>
|
||||
<a href="{{ url_for('dashboard') }}" class="btn btn-primary mt-1">Auswertung</a>
|
||||
<a class="navbar-brand" href="#">Dashboard - Verbindungsanalyse</a>
|
||||
<div class="navbar-collapse" id="navbarNav">
|
||||
<ul class="navbar-nav ms-auto">
|
||||
<li class="nav-item"><a href="{{ url_for('index') }}" class="nav-link">App</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('mylinks') }}" class="nav-link">Meine Links</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('connections') }}" class="nav-link">Verbindungen</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('dashboard') }}" class="nav-link">Auswertung</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<!-- Main Container -->
|
||||
<div class="container-fluid px-4">
|
||||
<!-- Dropdown Controls -->
|
||||
<div class="mb-4 d-flex flex-wrap gap-2">
|
||||
<!-- Timeframe Dropdown -->
|
||||
<div class="mb-3">
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-sm mt-1 dropdown-toggle btn-secondary"
|
||||
<button class="btn btn-secondary dropdown-toggle"
|
||||
type="button" id="timeframeDropdown" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
{% if session['timeframe'] == 'last24hours' %}
|
||||
Last 24 Hours
|
||||
@ -72,8 +83,11 @@
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<!-- Filetype Dropdown -->
|
||||
<button class="btn btn-sm mt-1 dropdown-toggle btn-secondary"
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-secondary dropdown-toggle"
|
||||
type="button" id="filetypeDropdown" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
{% if session['filetype'] == 'audio' %}
|
||||
Audio
|
||||
@ -115,73 +129,74 @@
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Summary Cards -->
|
||||
<div class="row mb-4">
|
||||
<div class="col-md-3">
|
||||
<div class="card text-white bg-info">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="card bg-info text-white">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">Alle Downloads</h5>
|
||||
<p class="card-text">{{ total_accesses }}</p>
|
||||
<p class="card-text display-6">{{ total_accesses }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="card text-white bg-success">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="card bg-success text-white">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">eindeutige Dateien</h5>
|
||||
<p class="card-text">{{ unique_files }}</p>
|
||||
<h5 class="card-title">unterschiedliche Dateien</h5>
|
||||
<p class="card-text display-6">{{ unique_files }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="card text-white bg-warning">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="card bg-warning text-white">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">eindeutige Nutzer</h5>
|
||||
<p class="card-text">{{ unique_user }}</p>
|
||||
<h5 class="card-title">unterschiedliche Nutzer</h5>
|
||||
<p class="card-text display-6">{{ unique_user }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="card text-white bg-secondary">
|
||||
<div class="col-md-3 mb-3">
|
||||
<div class="card bg-secondary text-white">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">beschleunigte Downloads</h5>
|
||||
<p class="card-text">{{ cached_percentage }} %</p>
|
||||
<p class="card-text display-6">{{ cached_percentage }} %</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Charts Section -->
|
||||
<div class="row">
|
||||
<div class="row mb-4">
|
||||
<!-- Access Trend Chart -->
|
||||
<div class="col-md-6 mb-4">
|
||||
<div class="col-md-6 mb-3">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">eindeutige Nutzer nach Zeit</h5>
|
||||
<h5 class="card-title">Anzahl Nutzer</h5>
|
||||
<canvas id="distinctDeviceChart"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Timeframe Breakdown Chart (Bar Chart) -->
|
||||
<div class="col-md-6 mb-4">
|
||||
<!-- Timeframe Breakdown Chart -->
|
||||
<div class="col-md-6 mb-3">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">Downloads nach Zeit</h5>
|
||||
<h5 class="card-title">Anzahl Downloads</h5>
|
||||
<canvas id="downloadTimeframeChart"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- User Agent Distribution Chart -->
|
||||
<div class="col-md-6 mb-4">
|
||||
<div class="col-md-6 mb-3">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">Verwendete Endgeräte</h5>
|
||||
<h5 class="card-title">Endgeräte der Nutzer</h5>
|
||||
<canvas id="userAgentChart"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Folder Distribution Chart -->
|
||||
<div class="col-md-6 mb-4">
|
||||
<div class="col-md-6 mb-3">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">Verteilung auf Ordner</h5>
|
||||
@ -191,12 +206,13 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- New Section: IP Address Access Data -->
|
||||
<div class="card">
|
||||
<!-- IP Address Access Data -->
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
Verteilung der Zugriffe
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
@ -214,20 +230,22 @@
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr>
|
||||
<td colspan="4">No access data available for the selected timeframe.</td>
|
||||
<td colspan="3">No access data available for the selected timeframe.</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Detailed Table of Top File Accesses -->
|
||||
<div class="card mb-4">
|
||||
<div class="card-header">
|
||||
Detailierte Dateizugriffe (Top 20)
|
||||
Detaillierte Dateizugriffe (Top 20)
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
@ -250,10 +268,10 @@
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Load Chart.js from CDN -->
|
||||
<!-- Scripts -->
|
||||
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
|
||||
<script>
|
||||
@ -267,25 +285,18 @@
|
||||
distinctDeviceData = distinctDeviceData.slice(1);
|
||||
timeframeData = timeframeData.slice(1);
|
||||
|
||||
// shift the labels to local time zone
|
||||
// Shift the labels to local time zone
|
||||
const timeframe = "{{ timeframe }}"; // e.g., 'last24hours', '7days', '30days', or '365days'
|
||||
const shiftedLabels = timeframeData.map((item, index) => {
|
||||
const shiftedLabels = timeframeData.map((item) => {
|
||||
if (timeframe === 'last24hours') {
|
||||
|
||||
// item.bucket is now in the format "YYYY-MM-DDTHH:00:00Z"
|
||||
const bucketDate = new Date(item.bucket);
|
||||
const now = new Date();
|
||||
|
||||
// Check if this bucket corresponds to the current hour (in client's local time)
|
||||
const isCurrentHour =
|
||||
bucketDate.getFullYear() === now.getFullYear() &&
|
||||
bucketDate.getMonth() === now.getMonth() &&
|
||||
bucketDate.getDate() === now.getDate() &&
|
||||
bucketDate.getHours() === now.getHours();
|
||||
|
||||
// For the current hour, use the current time as the bucket end.
|
||||
const bucketEnd = isCurrentHour ? now : new Date(bucketDate.getTime() + 3600 * 1000);
|
||||
|
||||
return `${bucketDate.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })} - ${bucketEnd.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}`;
|
||||
} else if (timeframe === '7days' || timeframe === '30days') {
|
||||
const localDate = new Date(item.bucket);
|
||||
@ -319,15 +330,13 @@
|
||||
y: {
|
||||
title: { display: true, text: 'Device Count' },
|
||||
beginAtZero: true,
|
||||
ticks: {
|
||||
stepSize: 1
|
||||
}
|
||||
ticks: { stepSize: 1 }
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Timeframe Breakdown Chart - Bar Chart (for 'last24hours' timeframe)
|
||||
// Timeframe Breakdown Chart
|
||||
const ctxTimeframe = document.getElementById('downloadTimeframeChart').getContext('2d');
|
||||
new Chart(ctxTimeframe, {
|
||||
type: 'bar',
|
||||
@ -347,15 +356,13 @@
|
||||
y: {
|
||||
title: { display: true, text: 'Download Count' },
|
||||
beginAtZero: true,
|
||||
ticks: {
|
||||
stepSize: 1
|
||||
}
|
||||
ticks: { stepSize: 1 }
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// User Agent Distribution - Pie Chart (using aggregated device data)
|
||||
// User Agent Distribution Chart - Pie Chart
|
||||
const ctxUserAgent = document.getElementById('userAgentChart').getContext('2d');
|
||||
new Chart(ctxUserAgent, {
|
||||
type: 'pie',
|
||||
@ -368,9 +375,9 @@
|
||||
options: { responsive: true }
|
||||
});
|
||||
|
||||
// folder Distribution - Pie Chart (with shortened folders)
|
||||
const ctxfolder = document.getElementById('folderChart').getContext('2d');
|
||||
new Chart(ctxfolder, {
|
||||
// Folder Distribution Chart - Pie Chart
|
||||
const ctxFolder = document.getElementById('folderChart').getContext('2d');
|
||||
new Chart(ctxFolder, {
|
||||
type: 'pie',
|
||||
data: {
|
||||
labels: folderData.map(item => item.folder),
|
||||
@ -381,5 +388,5 @@
|
||||
options: { responsive: true }
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -1,17 +1,16 @@
|
||||
<!doctype html>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Meine Links</title>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<title>Meine Links</title>
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<style>
|
||||
html, body {
|
||||
height: 100%;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
/* Use full width */
|
||||
.container-fluid {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
@ -25,14 +24,22 @@
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<!-- Navigation Bar -->
|
||||
<nav class="navbar navbar-expand-lg navbar-dark bg-secondary mb-3">
|
||||
<div class="container-fluid">
|
||||
<h1 class="mb-4">Übersicht deiner gültigen Links</h1>
|
||||
<div class="mb-3">
|
||||
<a href="{{ url_for('index') }}" class="btn btn-primary mt-1">App</a>
|
||||
<a href="{{ url_for('mylinks') }}" class="btn btn-primary mt-1">Meine Links</a>
|
||||
<a href="{{ url_for('connections') }}" class="btn btn-primary mt-1">Verbindungen</a>
|
||||
<a href="{{ url_for('dashboard') }}" class="btn btn-primary mt-1">Auswertung</a>
|
||||
<a class="navbar-brand" href="#">Übersicht deiner gültigen Links</a>
|
||||
<div class="navbar-collapse" id="navbarNav">
|
||||
<ul class="navbar-nav ms-auto">
|
||||
<li class="nav-item"><a href="{{ url_for('index') }}" class="nav-link">App</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('mylinks') }}" class="nav-link">Meine Links</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('connections') }}" class="nav-link">Verbindungen</a></li>
|
||||
<li class="nav-item"><a href="{{ url_for('dashboard') }}" class="nav-link">Auswertung</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="container-fluid">
|
||||
{% if allowed_secrets %}
|
||||
<div class="row">
|
||||
{% for secret in allowed_secrets %}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user