lelo/bethaus-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development'

Browse Source
This commit is contained in:
lelo 2025-05-09 21:46:03 +00:00
commit 15c2bd6a1b
6 changed files with 98 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
static/app.css
View File

@ -24,7 +24,6 @@ body {
display: flex;
align-items: center;
padding: 10px 20px;
/* width: 100%; */
}
.site-header img.logo {
height: 50px;
@ -34,9 +33,7 @@ body {
font-size: 1.5em;
margin: 0;
}
.container {
padding: 20px;
}
.wrapper {
display: grid;
grid-template-rows: auto 1fr auto;
@ -44,9 +41,10 @@ body {
padding-bottom: 200px;
}
.container {
max-width: 1200px;
width: 90%;
max-width: 900px;
margin: 0 auto;
padding: 20px 0;
}
.container a {
@ -54,29 +52,35 @@ body {
}
.container-fluid {
height: 100%;
display: flex;
flex-direction: column;
padding: 20px;
}
/* Breadcrumb Styles */
.breadcrumb {
margin-bottom: 15px;
font-size: 22px;
}
.breadcrumb a {
font-size: 19px;
text-decoration: none;
color: var(--main-text-color);
margin-right: 5px;
}
.breadcrumb span {
font-size: 19px;
color: #ccc;
margin-left: 5px;
margin-right: 5px;
margin-bottom: 10px;
}
.separator::before {
content: "\A"; /* Inserts a line break */
white-space: pre; /* Ensures the newline is honored */
/* Admin Nav Styles */
.admin-nav {
color: #ccc;
border: 1px solid #ccc;
padding: 10px;
background-color: #979797;
}
.admin-nav a {
color: #ccc;
text-decoration: none;
padding: 5px 0;
}
/* List Styles */

71
templates/app.html
View File

@ -1,39 +1,44 @@
<!doctype html>
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta property="og:title" content="{{ title_long }}" />
<meta property="og:description" content="... uns aber, die wir gerettet werden, ist es eine Gotteskraft." />
<meta property="og:image" content="/icon/logo-200x200.png" />
<title>{{ title_short }}</title>
<title>{{ title_short }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta name="description" content="... uns aber, die wir gerettet werden, ist es eine Gotteskraft.">
<meta name="author" content="{{ title_short }}">
<link rel="icon" href="/icon/logo-192x192.png" type="image/png" sizes="192x192">
<meta property="og:title" content="{{ title_long }}" />
<meta property="og:description" content="... uns aber, die wir gerettet werden, ist es eine Gotteskraft." />
<meta property="og:image" content="/icon/logo-200x200.png" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta name="description" content="... uns aber, die wir gerettet werden, ist es eine Gotteskraft.">
<meta name="author" content="{{ title_short }}">
<link rel="icon" href="/icon/logo-192x192.png" type="image/png" sizes="192x192">
<!-- Web App Manifest -->
<link rel="manifest" href="{{ url_for('static', filename='manifest.json') }}">
<!-- Web App Manifest -->
<link rel="manifest" href="{{ url_for('static', filename='manifest.json') }}">
<!-- Android Theme Color -->
<meta name="theme-color" content="#000">
<!-- Android Theme Color -->
<meta name="theme-color" content="#000">
<!-- Apple-specific tags -->
<link rel="touch-icon" href="{{ url_for('static', filename='icons/icon-192x192.png') }}">
<meta name="mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-status-bar-style" content="default">
<meta name="mobile-web-app-title" content="Gottesdienste">
<!-- Apple-specific tags -->
<link rel="touch-icon" href="{{ url_for('static', filename='icons/icon-192x192.png') }}">
<meta name="mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-status-bar-style" content="default">
<meta name="mobile-web-app-title" content="Gottesdienste">
<!-- Your CSS -->
<link rel="stylesheet" href="{{ url_for('static', filename='theme.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='app.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='gallery.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='audioplayer.css') }}">
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
<script> const admin_enabled = {{ admin_enabled | tojson | safe }}; </script>
</head>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css" rel="stylesheet">
<!-- Your CSS -->
<link rel="stylesheet" href="{{ url_for('static', filename='theme.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='app.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='gallery.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='audioplayer.css') }}">
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
<script> const admin_enabled = {{ admin_enabled | tojson | safe }}; </script>
</head>
<body>
<script src="{{ url_for('static', filename='functions.js') }}"></script>
<header class="site-header">
@ -44,14 +49,14 @@
</header>
<div class="wrapper">
{% if admin_enabled %}
<div style="color: #ccc; border: 1px solid #ccc; padding: 10px; background-color: #979797;">
<a href="{{ url_for('mylinks') }}" class="btn" style="color: #ccc; text-decoration: none;">Meine Links</a>
<div class="admin-nav">
<a href="{{ url_for('mylinks') }}">Meine Links</a>
<span> | </span>
<a href="{{ url_for('connections') }}" class="btn" style="color: #ccc; text-decoration: none;">Verbindungen</a>
<a href="{{ url_for('connections') }}">Verbindungen</a>
<span> | </span>
<a href="{{ url_for('dashboard') }}" class="btn" style="color: #ccc; text-decoration: none;">Auswertung</a>
<a href="{{ url_for('dashboard') }}">Auswertung</a>
<span> | </span>
<a href="{{ url_for('folder_secret_config_editor') }}" class="btn" style="color: #ccc; text-decoration: none;" id="edit-folder-config" >Ordnerkonfiguration</a>
<a href="{{ url_for('folder_secret_config_editor') }}" id="edit-folder-config" >Ordnerkonfiguration</a>
</div>
{% endif %}
<div class="container">

41
templates/base.html
View File

@ -1,11 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<html>
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title>{% block title %}Meine Links{% endblock %}</title>
<!-- Android Theme Color -->
<meta name="theme-color" content="#000">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css" rel="stylesheet">
<link rel="stylesheet" href="{{ url_for('static', filename='theme.css') }}">
@ -22,20 +34,19 @@
</header>
<div class="wrapper">
<!-- Navigation Bar -->
<div style="margin-bottom: 10px; background-color:rgb(187, 187, 187); padding: 5px; ">
<span> </span>
<a href="{{ url_for('index') }}" class="btn btn-sm">App</a>
<span class="btn btn-sm">|</span>
<a href="{{ url_for('mylinks') }}" class="btn btn-sm">Meine Links</a>
<span class="btn btn-sm">|</span>
<a href="{{ url_for('connections') }}" class="btn btn-sm">Verbindungen</a>
<span class="btn btn-sm">|</span>
<a href="{{ url_for('dashboard') }}" class="btn btn-sm">Auswertung-Downloads</a>
<span class="btn btn-sm">|</span>
<a href="{{ url_for('songs_dashboard') }}" class="btn btn-sm">Auswertung-Wiederholungen</a>
<div class="admin-nav">
<a href="{{ url_for('index') }}">App</a>
<span> | </span>
<a href="{{ url_for('mylinks') }}">Meine Links</a>
<span> | </span>
<a href="{{ url_for('connections') }}">Verbindungen</a>
<span> | </span>
<a href="{{ url_for('dashboard') }}">Auswertung-Downloads</a>
<span> | </span>
<a href="{{ url_for('songs_dashboard') }}">Auswertung-Wiederholungen</a>
{% if admin_enabled %}
<span class="btn btn-sm">|</span>
<a href="{{ url_for('folder_secret_config_editor') }}" class="btn btn-sm" id="edit-folder-config">Ordnerkonfiguration</a>
<span> | </span>
<a href="{{ url_for('folder_secret_config_editor') }}" id="edit-folder-config">Ordnerkonfiguration</a>
{% endif %}
</div>

2
templates/dashboard.html
View File

@ -8,7 +8,7 @@
{% block content %}
<!-- Main Container -->
<div class="container-fluid px-4">
<div class="container">
<h2>Auswertung-Downloads</h2>
<!-- Dropdown Controls -->
<div class="mb-4 d-flex flex-wrap gap-2">

10
templates/folder_secret_config_editor.html
View File

@ -178,11 +178,11 @@
const actions = document.createElement('div');
if (!isEdit) {
const openLink = document.createElement('a');
openLink.className = 'btn btn-secondary btn-sm me-2';
openLink.href = `/?secret=${rec.secret}`;
openLink.textContent = 'Link öffnen';
actions.appendChild(openLink);
const openButton = document.createElement('button');
openButton.className = 'btn btn-secondary btn-sm me-2';
openButton.onclick = () => window.open(`/?secret=${rec.secret}`, '_self');
openButton.textContent = 'Link öffnen';
actions.appendChild(openButton);
}
const delBtn = document.createElement('button');

16
templates/mylinks.html
View File

@ -6,7 +6,7 @@
{# page‐specific content #}
{% block content %}
<div class="container-fluid">
<div class="container">
<h2>Übersicht deiner gültigen Links</h2>
<div class="row">
{% if valid_secrets %}
@ -21,11 +21,8 @@
<p class="card-text">
<small class="text-muted">Gültig bis: {{ secret_valid_to[secret] }}</small>
</p>
<a href="{{ secret_url[secret] }}" class="btn btn-secondary btn-sm" style="text-decoration: none;">Link öffnen</a>
<button class="btn btn-secondary btn-sm"
onclick="toClipboard('{{ secret_url[secret] }}')">
Link kopieren
</button>
<button class="btn btn-secondary btn-sm" onclick="window.open('{{ secret_url[secret] }}', '_self')">Link öffnen</button>
<button class="btn btn-secondary btn-sm" onclick="toClipboard('{{ secret_url[secret] }}')">Link kopieren</button>
<br>
<form method="post" action="{{ url_for('remove_secret') }}" class="mt-3">
<input type="hidden" name="secret" value="{{ secret }}">
@ -61,11 +58,8 @@
<p class="card-text">
<small class="text-muted">Gültig bis: {{ token_valid_to[token] }}</small>
</p>
<a href="{{ token_url[token] }}" class="btn btn-secondary btn-sm">Link öffnen</a>
<button class="btn btn-secondary btn-sm"
onclick="toClipboard('{{ token_url[token] }}')">
Link kopieren
</button>
<button class="btn btn-secondary btn-sm" onclick="window.open('{{ token_url[token] }}', '_self')">Link öffnen</button>
<button class="btn btn-secondary btn-sm" onclick="toClipboard('{{ token_url[token] }}')">Link kopieren</button>
<br>
<form method="post" action="{{ url_for('remove_token') }}" class="mt-3">
<input type="hidden" name="token" value="{{ token }}">