Add persistent volume to mariadb container.

There are now two dockerfiles. One for production, one for development.
All configuration is now also handled through dotenv files,
which these dotenv files, as well as the included VSCode launch tasks
use.

.env.dev

@@ -0,0 +1,12 @@
+# MariaDB
+MARIADB_ROOT_PASSWORD=mariadb_root_password
+MARIADB_ROOT_HOST=localhost
+MARIADB_DATABASE=karaoqueue
+MARIADB_USER=karaoqueue
+MARIADB_PASSWORD=mariadb_karaoqueue_password
+
+# Karaoqueue
+DEPLOYMENT_PLATFORM=Docker
+DBSTRING="mysql+pymysql://karaoqueue:mariadb_karaoqueue_password@127.0.0.1:3306/karaoqueue?charset=utf8mb4"
+INITIAL_USERNAME=admin
+INITIAL_PASSWORD=changeme

.gitignore

@@ -134,4 +134,10 @@ data/
 
 # Node Modules
 
-node_modules/
+node_modules/
+
+# Version identification file
+.version
+
+# Docker secrets
+secrets.yml

.vscode/launch.json

@@ -4,43 +4,83 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-
-
-
-        {"name":"Python: Flask","type":"python","request":"launch","module":"flask","env":{"FLASK_APP":"backend/app/main.py","FLASK_ENV":"development","FLASK_DEBUG":"1"},"args":["run","--no-debugger","--no-reload"],"jinja":true},
-        {"name":"Python: Flask (with reload)","type":"python","request":"launch","module":"flask","env":{"FLASK_APP":"backend/app/main.py","FLASK_ENV":"development","FLASK_DEBUG":"1"},"args":["run","--no-debugger"],"jinja":true},
         {
-            "name": "Python: Flask (with reload, externally reachable)",
+            "preLaunchTask": "mariadb",
+            "name": "Python: Flask",
             "type": "python",
+            "cwd": "${workspaceFolder}/backend",
             "request": "launch",
             "module": "flask",
             "env": {
-                "FLASK_APP": "backend/app/main.py",
+                "FLASK_APP": "backend/app.py",
                 "FLASK_ENV": "development",
-                "FLASK_DEBUG": "1"
+                "FLASK_DEBUG": "1", 
             },
+            "envFile": "${workspaceFolder}/.env.dev",
             "args": [
                 "run",
                 "--no-debugger",
-                "--host='0.0.0.0'"
+                "--no-reload"
             ],
             "jinja": true
         },
         {
-            "name": "Python: Flask (externally reachable)",
+            "preLaunchTask": "mariadb",
+            "name": "Python: Flask (with reload)",
             "type": "python",
+            "cwd": "${workspaceFolder}/backend",
             "request": "launch",
             "module": "flask",
             "env": {
-                "FLASK_APP": "backend/app/main.py",
+                "FLASK_APP": "backend/app.py",
                 "FLASK_ENV": "development",
                 "FLASK_DEBUG": "1"
             },
+            "envFile": "${workspaceFolder}/.env.dev",
+            "args": [
+                "run",
+                "--no-debugger"
+            ],
+            "jinja": true
+        },
+        {
+            "preLaunchTask": "mariadb",
+            "name": "Python: Flask (with reload, externally reachable)",
+            "type": "python",
+            "cwd": "${workspaceFolder}/backend",
+            "request": "launch",
+            "module": "flask",
+            "env": {
+                "FLASK_APP": "backend/app.py",
+                "FLASK_ENV": "development",
+                "FLASK_DEBUG": "1"
+            },
+            "envFile": "${workspaceFolder}/.env.dev",
+            "args": [
+                "run",
+                "--no-debugger",
+                "--host=0.0.0.0"
+            ],
+            "jinja": true
+        },
+        {
+            "preLaunchTask": "mariadb",
+            "name": "Python: Flask (externally reachable)",
+            "type": "python",
+            "cwd": "${workspaceFolder}/backend",
+            "request": "launch",
+            "module": "flask",
+            "env": {
+                "FLASK_APP": "backend/app.py",
+                "FLASK_ENV": "development",
+                "FLASK_DEBUG": "1"
+            },
+            "envFile": "${workspaceFolder}/.env.dev",
             "args": [
                 "run",
                 "--no-debugger",
                 "--no-reload",
-                "--host='0.0.0.0'"
+                "--host=0.0.0.0"
             ],
             "jinja": true
         },

.vscode/tasks.json

@@ -0,0 +1,20 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "versiondump",
+            "type": "shell",
+            "command": "echo \"$(git rev-parse --abbrev-ref HEAD)-$(git describe)\"> ${workspaceFolder}/backend/.version",
+            "problemMatcher": []
+        },
+        {
+            "label": "mariadb",
+            "type": "shell",
+            "command": "docker-compose -f docker-compose.yml up --remove-orphans",
+            "isBackground": true,
+            "activeOnStart": false
+        }
+    ]
+}

Dockerfile

@@ -0,0 +1,16 @@
+FROM tiangolo/meinheld-gunicorn-flask:python3.9
+
+RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
+RUN curl -LsS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup | bash
+
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get dist-upgrade
+
+COPY ./backend/requirements.txt /app/requirements.txt
+
+RUN pip install --no-cache-dir --upgrade -r /app/requirements.txt
+
+RUN pip install --no-cache-dir -U meinheld
+
+COPY ./backend /app

backend/Dockerfile

@@ -1,11 +0,0 @@
-FROM tiangolo/uwsgi-nginx-flask:python3.7
-
-RUN pip install requests
-
-RUN pip install pandas
-
-RUN pip install Flask-BasicAuth
-
-RUN pip install bs4
-
-COPY ./app /app

backend/Procfile

@@ -0,0 +1 @@
+web: gunicorn wsgi:app

backend/app.py

@@ -0,0 +1,278 @@
+from flask import Flask, render_template, abort, request, redirect, send_from_directory, jsonify
+from flask.wrappers import Request, Response
+import helpers
+import database
+import data_adapters
+import os
+import json
+from flask_basicauth import BasicAuth
+from helpers import nocache
+app = Flask(__name__, static_url_path='/static')
+
+basic_auth = BasicAuth(app)
+accept_entries = True
+
+@app.route("/")
+def home():
+    if basic_auth.authenticate():
+        return render_template('main_admin.html', list=database.get_list(), auth=basic_auth.authenticate())
+    else:
+        return render_template('main.html', list=database.get_list(), auth=basic_auth.authenticate())
+
+
+@app.route("/favicon.ico")
+def favicon():
+    return send_from_directory(os.path.join(app.root_path, 'static'),
+                               'favicon.ico', mimetype='image/vnd.microsoft.icon')
+
+
+@app.route('/api/enqueue', methods=['POST'])
+@nocache
+def enqueue():
+    if not request.json:
+        print(request.data)
+        abort(400)
+    client_id = request.json['client_id']
+    if not helpers.is_valid_uuid(client_id):
+        print(request.data)
+        abort(400)
+    name = request.json['name']
+    song_id = request.json['id']
+    if request.authorization:
+        database.add_entry(name, song_id, client_id)
+        return Response('{"status":"OK"}', mimetype='text/json')
+    else:
+        if helpers.get_accept_entries(app):
+            if not request.json:
+                print(request.data)
+                abort(400)
+            client_id = request.json['client_id']
+            if not helpers.is_valid_uuid(client_id):
+                print(request.data)
+                abort(400)
+            name = request.json['name']
+            song_id = request.json['id']
+            if database.check_queue_length() < int(app.config['MAX_QUEUE']):
+                if database.check_entry_quota(client_id) < int(app.config['ENTRY_QUOTA']):
+                    database.add_entry(name, song_id, client_id)
+                    return Response('{"status":"OK"}', mimetype='text/json')
+                else:
+                    return Response('{"status":"Du hast bereits ' + str(database.check_entry_quota(client_id)) + ' Songs eingetragen, dies ist das Maximum an Einträgen die du in der Warteliste haben kannst."}', mimetype='text/json', status=423)
+            else:
+                return Response('{"status":"Die Warteschlange enthält momentan ' + str(database.check_queue_length()) + ' Einträge und ist lang genug, bitte versuche es noch einmal wenn ein paar Songs gesungen wurden."}', mimetype='text/json', status=423)
+        else:
+            return Response('{"status":"Currently not accepting entries"}', mimetype='text/json', status=423)
+
+
+@app.route("/list")
+def songlist():
+    return render_template('songlist.html', list=database.get_song_list(), auth=basic_auth.authenticate())
+
+
+@app.route("/settings")
+@nocache
+@basic_auth.required
+def settings():
+    return render_template('settings.html', app=app, auth=basic_auth.authenticate(), themes=helpers.get_themes())
+
+
+@app.route("/settings", methods=['POST'])
+@nocache
+@basic_auth.required
+def settings_post():
+    entryquota = request.form.get("entryquota")
+    maxqueue = request.form.get("maxqueue")
+    theme = request.form.get("theme")
+    username = request.form.get("username")
+    password = request.form.get("password")
+    changed_credentials = False
+    if entryquota.isnumeric() and int(entryquota) > 0:  # type: ignore
+        app.config['ENTRY_QUOTA'] = int(entryquota)  # type: ignore
+    else:
+        abort(400)
+    if maxqueue.isnumeric and int(maxqueue) > 0:  # type: ignore
+        app.config['MAX_QUEUE'] = int(maxqueue)  # type: ignore
+    else:
+        abort(400)
+    if theme is not None and theme in helpers.get_themes():
+        helpers.set_theme(app,theme)
+    else:
+        abort(400)
+    if username != "" and username != app.config['BASIC_AUTH_USERNAME']:
+        app.config['BASIC_AUTH_USERNAME'] = username
+        changed_credentials = True
+    if password != "":
+        app.config['BASIC_AUTH_PASSWORD'] = password
+        changed_credentials = True
+    helpers.persist_config(app=app)
+    if changed_credentials:
+        return redirect("/")
+    else:
+        return render_template('settings.html', app=app, auth=basic_auth.authenticate(), themes=helpers.get_themes())
+
+
+@app.route("/api/queue")
+@nocache
+def queue_json():
+    list = data_adapters.dict_from_rows(database.get_list())
+    return Response(json.dumps(list, ensure_ascii=False).encode('utf-8'), mimetype='text/json')
+
+
+@app.route("/plays")
+@nocache
+@basic_auth.required
+def played_list():
+    return render_template('played_list.html', list=database.get_played_list(), auth=basic_auth.authenticate())
+
+
+@app.route("/api/songs")
+@nocache
+def songs():
+    list = database.get_song_list()
+    return Response(json.dumps(list, ensure_ascii=False).encode('utf-8'), mimetype='text/json')
+
+
+@app.route("/api/songs/update")
+@nocache
+@basic_auth.required
+def update_songs():
+    database.delete_all_entries()
+    status = database.import_songs(
+        helpers.get_songs(helpers.get_catalog_url()))
+    print(status)
+    return Response('{"status": "%s" }' % status, mimetype='text/json')
+
+
+@app.route("/api/songs/compl") # type: ignore
+@nocache
+def get_song_completions(input_string=""):
+    input_string = request.args.get('search', input_string)
+    if input_string != "":
+        print(input_string)
+        result = [list(x) for x in database.get_song_completions(input_string=input_string)]
+        return jsonify(result)
+
+    else:
+        return 400
+
+
+@app.route("/api/entries/delete/<entry_id>")
+@nocache
+@basic_auth.required
+def delete_entry(entry_id):
+    if database.delete_entry(entry_id):
+        return Response('{"status": "OK"}', mimetype='text/json')
+    else:
+        return Response('{"status": "FAIL"}', mimetype='text/json')
+
+
+@app.route("/api/entries/delete", methods=['POST'])
+@nocache
+@basic_auth.required
+def delete_entries():
+    if not request.json:
+        print(request.data)
+        abort(400)
+        return
+    updates = database.delete_entries(request.json)
+    if updates >= 0:
+        return Response('{"status": "OK", "updates": '+str(updates)+'}', mimetype='text/json')
+    else:
+        return Response('{"status": "FAIL"}', mimetype='text/json', status=400)
+
+
+@app.route("/api/entries/mark_sung/<entry_id>")
+@nocache
+@basic_auth.required
+def mark_sung(entry_id):
+    if database.add_sung_song(entry_id):
+        return Response('{"status": "OK"}', mimetype='text/json')
+    else:
+        return Response('{"status": "FAIL"}', mimetype='text/json')
+
+@app.route("/api/entries/mark_transferred/<entry_id>")
+@nocache
+@basic_auth.required
+def mark_transferred(entry_id):
+    if database.toggle_transferred(entry_id):
+        return Response('{"status": "OK"}', mimetype='text/json')
+    else:
+        return Response('{"status": "FAIL"}', mimetype='text/json')
+
+
+@app.route("/api/entries/accept/<value>")
+@nocache
+@basic_auth.required
+def set_accept_entries(value):
+    if (value == '0' or value == '1'):
+        helpers.set_accept_entries(app,bool(int(value)))
+        return Response('{"status": "OK"}', mimetype='text/json')
+    else:
+        return Response('{"status": "FAIL"}', mimetype='text/json', status=400)
+
+
+@app.route("/api/entries/accept")
+@nocache
+def get_accept_entries():
+    accept_entries = helpers.get_accept_entries(app)
+    return Response('{"status": "OK", "value": '+str(int(accept_entries))+'}', mimetype='text/json')
+
+
+@app.route("/api/played/clear")
+@nocache
+@basic_auth.required
+def clear_played_songs():
+    if database.clear_played_songs():
+        return Response('{"status": "OK"}', mimetype='text/json')
+    else:
+        return Response('{"status": "FAIL"}', mimetype='text/json')
+
+
+@app.route("/api/entries/delete_all")
+@nocache
+@basic_auth.required
+def delete_all_entries():
+    if database.delete_all_entries():
+        return Response('{"status": "OK"}', mimetype='text/json')
+    else:
+        return Response('{"status": "FAIL"}', mimetype='text/json')
+
+
+@app.route("/login")
+@basic_auth.required
+def admin():
+    return redirect("/", code=303)
+
+
+@app.before_first_request
+def activate_job():
+    helpers.load_dbconfig(app)
+    helpers.load_version(app)
+    helpers.create_data_directory()
+    database.create_entry_table()
+    database.create_song_table()
+    database.create_done_song_table()
+    database.create_list_view()
+    database.create_done_song_view()
+    database.create_config_table()
+    helpers.setup_config(app)
+
+
+
+@app.after_request
+def add_header(response):
+    """
+    Add headers to both force latest IE rendering engine or Chrome Frame,
+    and also to cache the rendered page for 10 minutes.
+    """
+    if not 'Cache-Control' in response.headers:
+        response.headers['Cache-Control'] = 'private, max-age=600, no-cache, must-revalidate'
+    return response
+
+@app.context_processor
+def inject_version():
+    return dict(karaoqueue_version=app.config['VERSION'])
+
+
+if __name__ == "__main__":
+    app.run(host='127.0.0.1', port=8080, debug=True)

backend/app.yaml

@@ -1,5 +1,9 @@
 runtime: python39
 
+manual_scaling:
+  # Das ist alles bloß dumm schnell zusammengehackt...
+  instances: 1
+
 handlers:
   # This configures Google App Engine to serve the files in the app's static
   # directory.

backend/app/data_adapters.py

@@ -1,8 +0,0 @@
-def dict_from_row(row):
-    return dict(zip(row.keys(), row))
-
-def dict_from_rows(rows):
-    outlist=[]
-    for row in rows:
-        outlist.append(dict_from_row(row))
-    return outlist

backend/app/database.py

@@ -1,167 +0,0 @@
-# -*- coding: utf_8 -*-
-
-import sqlite3
-import pandas
-from io import StringIO
-
-song_table  = "songs"
-entry_table = "entries"
-index_label = "Id"
-done_table  = "done_songs"
-
-def open_db():
-    conn = sqlite3.connect("/tmp/karaoqueue.db")
-    conn.execute('PRAGMA encoding = "UTF-8";')
-    return conn
-
-def import_songs(song_csv):
-    print("Start importing Songs...")
-    df = pandas.read_csv(StringIO(song_csv), sep=';')
-    conn = open_db()
-    cur = conn.cursor()
-    df.to_sql(song_table, conn, if_exists='replace',
-              index=False)
-    cur.execute("SELECT Count(Id) FROM songs")
-    num_songs = cur.fetchone()[0]
-    conn.close()
-    print("Imported songs ({} in Database)".format(num_songs))
-    return("Imported songs ({} in Database)".format(num_songs)) 
-
-def create_entry_table():
-    conn = open_db()
-    conn.execute('CREATE TABLE IF NOT EXISTS '+entry_table +
-                 ' (ID INTEGER PRIMARY KEY NOT NULL, Song_Id INTEGER NOT NULL, Name VARCHAR(255))')
-    conn.close()
-
-
-def create_done_song_table():
-    conn = open_db()
-    conn.execute('CREATE TABLE IF NOT EXISTS '+done_table +
-                 ' (Song_Id INTEGER PRIMARY KEY NOT NULL,  Plays INTEGER)')
-    conn.close()
-
-def create_song_table():
-    conn = open_db()
-    conn.execute("CREATE TABLE IF NOT EXISTS \""+song_table+"""\" (
-        "Id" INTEGER,
-        "Title" TEXT,
-        "Artist" TEXT,
-        "Year" INTEGER,
-        "Duo" INTEGER,
-        "Explicit" INTEGER,
-        "Date Added" TEXT,
-        "Styles" TEXT,
-        "Languages" TEXT
-    )""")
-    conn.close()
-
-def create_list_view():
-    conn = open_db()
-    conn.execute("""CREATE VIEW IF NOT EXISTS [Liste] AS
-                 SELECT Name, Title, Artist, entries.Id, songs.Id
-                 FROM entries, songs
-                 WHERE entries.Song_Id=songs.Id""")
-    conn.close()
-
-
-def create_done_song_view():
-    conn = open_db()
-    conn.execute("""CREATE VIEW IF NOT EXISTS [Abspielliste] AS
-                 SELECT Artist || \" - \" || Title AS Song, Plays AS Wiedergaben
-                 FROM songs, done_songs
-                 WHERE done_songs.Song_Id=songs.Id""")
-    conn.close()
-
-def get_list():
-    conn = open_db()
-    conn.row_factory = sqlite3.Row
-    cur = conn.cursor()
-    cur.execute("SELECT * FROM Liste")
-    return cur.fetchall()
-
-
-def get_played_list():
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("SELECT * FROM Abspielliste")
-    return cur.fetchall()
-
-def get_song_list():
-    conn =open_db()
-    cur = conn.cursor()
-    cur.execute("SELECT Artist || \" - \" || Title AS Song, Id FROM songs;")
-    return cur.fetchall()
-
-def get_song_completions(input_string):
-    conn = open_db()
-    cur = conn.cursor()
-    # Don't look, it burns...
-    prepared_string = "%{0}%".format(input_string).upper()  # "Test" -> "%TEST%"
-    print(prepared_string)
-    cur.execute(
-        "SELECT Title || \" - \" || Artist AS Song, Id FROM songs WHERE REPLACE(REPLACE(REPLACE(REPLACE(UPPER( SONG ),'ö','Ö'),'ü','Ü'),'ä','Ä'),'ß','ẞ') LIKE (?) LIMIT 20;", (prepared_string,))
-    return cur.fetchall()
-
-def add_entry(name,song_id):
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute(
-        "INSERT INTO entries (Song_Id,Name) VALUES(?,?);", (song_id,name))
-    conn.commit()
-    conn.close()
-    return
-
-def add_sung_song(entry_id):
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("""SELECT Song_Id FROM entries WHERE Id=?""",(entry_id,))
-    song_id = cur.fetchone()[0]
-    cur.execute("""INSERT OR REPLACE INTO done_songs (Song_Id, Plays)
-                VALUES("""+str(song_id)+""",
-                       COALESCE(
-                           (SELECT Plays FROM done_songs
-                            WHERE Song_Id="""+str(song_id)+"), 0) + 1)"
-                )
-    conn.commit()
-    delete_entry(entry_id)
-    conn.close()
-    return True
-
-def clear_played_songs():
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("DELETE FROM done_songs")
-    conn.commit()
-    conn.close()
-    return True
-
-def delete_entry(id):
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("DELETE FROM entries WHERE id=?",(id,))
-    conn.commit()
-    conn.close()
-    return True
-
-
-def delete_entries(ids):
-    idlist = []
-    for x in ids:
-        idlist.append( (x,) )
-    try:
-        conn = open_db()
-        cur = conn.cursor()
-        cur.executemany("DELETE FROM entries WHERE id=?", idlist)
-        conn.commit()
-        conn.close()
-        return cur.rowcount
-    except sqlite3.Error as error:
-        return -1
-
-def delete_all_entries():
-    conn = open_db()
-    cur = conn.cursor()
-    cur.execute("DELETE FROM entries")
-    conn.commit()
-    conn.close()
-    return True

backend/app/helpers.py

@@ -1,39 +0,0 @@
-import requests
-from bs4 import BeautifulSoup
-import json
-import os
-
-data_directory = "data"
-config_file = data_directory+"/config.json"
-
-def create_data_directory():
-    if not os.path.exists(data_directory):
-        os.makedirs(data_directory)
-
-
-def get_catalog_url():
-    r = requests.get('https://www.karafun.de/karaoke-song-list.html')
-    soup = BeautifulSoup(r.content, 'html.parser')
-    url = soup.findAll('a', href=True, text='Available in CSV format')[0]['href']
-    return url
-
-def get_songs(url):
-    r = requests.get(url)
-    return r.text
-
-def check_config_exists():
-    return os.path.isfile(config_file)
-
-def setup_config(app):
-    if check_config_exists():
-        config = json.load(open(config_file))
-        with open(config_file, 'r') as handle:
-            config = json.load(handle)
-        print("Loaded existing config")
-    else:
-        config = {'username': 'admin', 'password': 'changeme'}
-        with open(config_file, 'w') as handle:
-            json.dump(config, handle, indent=4, sort_keys=True)
-        print("Wrote new config")
-    app.config['BASIC_AUTH_USERNAME'] = config['username']
-    app.config['BASIC_AUTH_PASSWORD'] = config['password']

backend/app/main.py

@@ -1,155 +0,0 @@
-from flask import Flask, render_template, Response, abort, request, redirect
-import helpers
-import database
-import data_adapters
-import os, errno
-import json
-from flask_basicauth import BasicAuth
-app = Flask(__name__, static_url_path='/static')
-
-basic_auth = BasicAuth(app)
-accept_entries = False
-
-@app.route("/")
-def home():
-    if basic_auth.authenticate():
-        return render_template('main_admin.html', list=database.get_list(), auth=basic_auth.authenticate())
-    else:
-        return render_template('main.html', list=database.get_list(), auth=basic_auth.authenticate())
-
-@app.route('/api/enqueue', methods=['POST'])
-def enqueue():
-    if accept_entries:
-        if not request.json:
-            print(request.data)
-            abort(400)
-        name = request.json['name']
-        song_id = request.json['id']
-        database.add_entry(name, song_id)
-        return Response('{"status":"OK"}', mimetype='text/json')
-    else:
-        return Response('{"status":"Currently not accepting entries"}', mimetype='text/json',status=423)
-    
-
-@app.route("/list")
-def songlist():
-    return render_template('songlist.html', list=database.get_song_list(), auth=basic_auth.authenticate())
-
-@app.route("/api/queue")
-def queue_json():
-    list = data_adapters.dict_from_rows(database.get_list())
-    return Response(json.dumps(list, ensure_ascii=False).encode('utf-8'), mimetype='text/json')
-
-@app.route("/plays")
-@basic_auth.required
-def played_list():
-    return render_template('played_list.html', list=database.get_played_list(), auth=basic_auth.authenticate())
-
-@app.route("/api/songs")
-def songs():
-    list = database.get_song_list()
-    return Response(json.dumps(list, ensure_ascii=False).encode('utf-8'), mimetype='text/json')
-
-@app.route("/api/songs/update")
-@basic_auth.required
-def update_songs():
-    database.delete_all_entries()
-    status = database.import_songs(helpers.get_songs(helpers.get_catalog_url()))
-    print(status)
-    return Response('{"status": "%s" }' % status, mimetype='text/json')
-
-
-@app.route("/api/songs/compl")
-def get_song_completions(input_string=""):
-    input_string = request.args.get('search',input_string)
-    if input_string!="":
-        print(input_string)
-        list = database.get_song_completions(input_string=input_string)
-        return Response(json.dumps(list, ensure_ascii=False).encode('utf-8'), mimetype='text/json')
-
-    else:
-        return 400
-
-
-@app.route("/api/entries/delete/<entry_id>")
-@basic_auth.required
-def delete_entry(entry_id):
-    if database.delete_entry(entry_id):
-        return Response('{"status": "OK"}', mimetype='text/json')
-    else:
-        return Response('{"status": "FAIL"}', mimetype='text/json')
-
-
-@app.route("/api/entries/delete", methods=['POST'])
-@basic_auth.required
-def delete_entries():
-    if not request.json:
-        print(request.data)
-        abort(400)
-        return
-    updates = database.delete_entries(request.json)
-    if updates >= 0:
-        return Response('{"status": "OK", "updates": '+str(updates)+'}', mimetype='text/json')
-    else:
-        return Response('{"status": "FAIL"}', mimetype='text/json', status=400)
-
-
-@app.route("/api/entries/mark_sung/<entry_id>")
-@basic_auth.required
-def mark_sung(entry_id):
-    if database.add_sung_song(entry_id):
-        return Response('{"status": "OK"}', mimetype='text/json')
-    else:
-        return Response('{"status": "FAIL"}', mimetype='text/json')
-
-@app.route("/api/entries/accept/<value>")
-@basic_auth.required
-def set_accept_entries(value):
-    global accept_entries
-    if (value=='0' or value=='1'):
-        accept_entries=bool(int(value))
-        return Response('{"status": "OK"}', mimetype='text/json')
-    else:
-        return Response('{"status": "FAIL"}', mimetype='text/json', status=400)
-
-
-@app.route("/api/entries/accept")
-def get_accept_entries():
-    global accept_entries
-    return Response('{"status": "OK", "value": '+str(int(accept_entries))+'}', mimetype='text/json')
-    
-
-@app.route("/api/played/clear")
-@basic_auth.required
-def clear_played_songs():
-    if database.clear_played_songs():
-        return Response('{"status": "OK"}', mimetype='text/json')
-    else:
-        return Response('{"status": "FAIL"}', mimetype='text/json')
-
-@app.route("/api/entries/delete_all")
-@basic_auth.required
-def delete_all_entries():
-    if database.delete_all_entries():
-        return Response('{"status": "OK"}', mimetype='text/json')
-    else:
-        return Response('{"status": "FAIL"}', mimetype='text/json')
-
-@app.route("/login")
-@basic_auth.required
-def admin():
-    return redirect("/", code=303)
-
-@app.before_first_request
-def activate_job():
-    helpers.create_data_directory()
-    database.create_entry_table()
-    database.create_song_table()
-    database.create_done_song_table()
-    database.create_list_view()
-    database.create_done_song_view()
-    helpers.setup_config(app)
-
-
-if __name__ == "__main__":    
-    app.run(host='127.0.0.1', port=8080, debug=True)

backend/app/requirements.txt

@@ -1,4 +0,0 @@
-requests
-pandas
-Flask-BasicAuth
-bs4

backend/app/static/css/style.css

@@ -1,77 +0,0 @@
-body {
-    padding-top: 5rem;
-}
-
-html, body {
-    height: 100%;
-}
-
-.site {
-    height: auto;
-    min-height: 100%;
-}
-
-main {
-    padding-bottom: 60px; /* Höhe des Footers */
-}
-
-.footer {
-    margin-top: -60px;
-    width: 100%;
-    height: 60px;
-    /* Set the fixed height of the footer here */
-    /*line-height: 60px; /* Vertically center the text there */
-    background-color: #f5f5f5;
-}
-
-.topbutton {
-    width: 100%;
-}
-
-table td {
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-table.entries tbody tr[data-index="0"] {
-    background-color: #007bff80;
-    font-weight: 600;
-}
-
-table.entries tbody tr[data-index="1"] {
-    background-color: #007bff40;
-    font-weight: 500;
-}
-
-table.entries tbody tr[data-index="2"] {
-    background-color: #007bff20;
-    font-weight: 400;
-}
-
-table.entries tbody tr[data-index="3"] {
-    background-color: #007bff10;
-}
-
-table td:first-child {
-    max-width: 200px !important;
-}
-
-@media (min-width: 768px) {
-    .topbutton {
-        width: auto;
-    }
-}
-
-@media print {
-    body {
-        font-size: 1.3em;
-    }
-
-    .footer {
-        display: none !important;
-    }
-
-    .admincontrols {
-        display: none;
-    }
-}

backend/app/templates/main_admin.html

@@ -1,193 +0,0 @@
-
-
-{% extends 'base.html' %}
-{% block title %}Warteliste-Admin{% endblock %}
-{% block content %}
-<style>
-table td:nth-child(2) {
-    overflow-y: hidden;
-    overflow-x: auto;
-    text-overflow: clip;
-    max-width: 200px !important;
-}
-</style>
-<div class="container">
-    <div id="toolbar">
-        <button type="button" class="topbutton btn btn-danger" onclick="confirmDeleteSelectedEntries()"><i
-                class="fas fa-trash mr-2"></i>Gewählte Einträge löschen</button>
-        <button type="button" class="topbutton btn btn-danger" onclick="confirmUpdateSongDatabase()"><i
-                class="fas fa-file-import mr-2"></i>Song-Datenbank
-            aktualisieren</button>
-        <input id="entryToggle" type="checkbox" class="topbutton" data-toggle="toggle" data-on="Eintragen erlaubt" data-off="Eintragen deaktiviert" data-onstyle="success" data-offstyle="danger">
-    </div>
-    <table class="table entries"
-            id="entrytable"
-            data-toggle="table"
-            data-search="true"
-            data-show-columns="true"
-            data-show-toggle="true"
-            data-multiple-select-row="true"
-            data-click-to-select="true"
-            data-toolbar="#toolbar"
-            data-pagination="true"
-            data-show-extended-pagination="true"
-            data-classes="table table-hover"
-            data-url="/api/queue"
-            data-show-refresh="true"
-            data-auto-refresh="true"
-            data-auto-refresh-interval="10">
-        <thead>
-            <tr>
-                <th data-field="state" data-checkbox="true"></th>
-                <th scope="col" data-field="Name">Name</th>
-                <th scope="col" data-field="Title">Song</th>
-                <th scope="col" data-field="Artist">Künstler</th>
-                <th scope="col" data-formatter="TableActions">Aktionen</th>
-            </tr>
-        </thead>
-    </table>
-    <a name="end"></a>
-</div>
-{% endblock %}
-{% block extrajs %}
-<script>
-    $(function () {
-        $('#entryToggle').change(function() {
-            $.ajax({url: "/api/entries/accept/"+($('#entryToggle').is(":checked") ? "1" : "0"), complete: setTimeout(refreshEntryToggle, 1000)});
-        })
-        refreshEntryToggle()
-        $("#entrytable").bootstrapTable().on('load-success.bs.table', function() {
-            $('[data-toggle="tooltip"]').tooltip()
-        })
-    })
-    function confirmDeleteEntry(name, entry_id) {
-        bootbox.confirm("Wirklich den Eintrag von "+name+" löschen?", function(result){
-            if (result) {
-                deleteEntry(entry_id)
-            }
-        })
-    }
-    function confirmDeleteSelectedEntries() {
-        bootbox.confirm({
-            message: "Wirklich gewählte Eintragungen löschen?", 
-            buttons: {
-                confirm: {
-                    label: 'Ja',
-                    className: 'btn btn-danger'
-                },
-                cancel: {
-                    label: 'Nein',
-                    className: 'btn btn-secondary'
-                }
-            },
-            callback: function(result){
-                if (result) {
-                    DeleteSelectedEntries(getIdSelections())
-                }
-            }
-        })
-    }
-    function confirmUpdateSongDatabase() {
-        bootbox.confirm({
-            message: "Wirklich die Song-Datenbank aktualisieren?<br>Dies lädt die Aktuelle Song-Liste von <a href='https://www.karafun.de/karaoke-song-list.html'>KaraFun</a> herunter, <b>und wird alle Eintragungen löschen!</b>",
-            buttons: {
-                confirm: {
-                    label: 'Ja',
-                    className: 'btn-primary'
-                },
-                cancel: {
-                    label: 'Nein',
-                    className: 'btn btn-secondary'
-                }
-            },
-            callback: function(result){
-                if (result) {
-                    var dialog = bootbox.dialog({
-                        message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Aktualisiere Song-Datenbank...</p>',
-    
-                        closeButton: false
-                    });
-                    updateSongDatabase(dialog)                    
-                }
-            }
-        })
-    }
-    function refreshEntryToggle() {
-        $.getJSON("/api/entries/accept", (data) => {
-            if (data["value"]!=$('#entryToggle').is(":checked")) {
-                if(data["value"]==1) {
-                $('#entryToggle').bootstrapToggle('on')
-                }
-                else {
-                    $('#entryToggle').bootstrapToggle('off')
-                }
-            }
-        })
-    }
-    function deleteEntry(entry_id) {
-       $.ajax({
-        type: 'GET',
-        url: '/api/entries/delete/'+entry_id,
-        contentType: "application/json",
-        dataType: 'json',
-        async: false
-       });
-       $("#entrytable").bootstrapTable('refresh')
-    
-    }
-    function markEntryAsSung(entry_id) {
-       $.ajax({
-        type: 'GET',
-        url: '/api/entries/mark_sung/'+entry_id,
-        contentType: "application/json",
-        dataType: 'json',
-        async: false
-       });
-       $("#entrytable").bootstrapTable('refresh')
-    
-    }
-    function DeleteSelectedEntries(ids) {
-        $.ajax({
-            type: 'POST',
-            url: '/api/entries/delete',
-            data: JSON.stringify(ids), // or JSON.stringify ({name: 'jonas'}),
-            error: function() {
-                bootbox.alert({
-                    message: "Fehler beim Löschen der Eintragungen.",
-                })
-            },
-            success: function() {
-                $("#entrytable").bootstrapTable('refresh')
-            
-            },
-            contentType: "application/json",
-            dataType: 'json'
-        });
-    }
-    function updateSongDatabase(wait_dialog) {
-        $.ajax({
-            type: 'GET',
-            url: '/api/songs/update',
-            contentType: "application/json",
-            dataType: 'json',
-            success: function(data) {
-                wait_dialog.modal('hide')
-                bootbox.alert({
-                    message: data["status"],
-                    callback: function() {
-                        $("#entrytable").bootstrapTable('refresh')
-                    }
-                })
-            }
-        });
-    }
-    function TableActions (value, row, index) {
-        return "<button type=\"button\" class=\"btn btn-success\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Als gesungen markieren\" onclick=\"markEntryAsSung("+row.ID+")\"><i class=\"fas fa-check\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-danger\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Eintrag löschen\" onclick=\"confirmDeleteEntry('"+row.Name+"',"+row.ID+")\"><i class=\"fas fa-trash\"></i></button>";
-    }
-    function getIdSelections() {
-        return $.map($("#entrytable").bootstrapTable('getSelections'), function (row) {
-            return row.ID
-        })
-    }
-</script>
-{% endblock %}

backend/data_adapters.py

@@ -0,0 +1,5 @@
+def dict_from_rows(rows):
+    outlist=[]
+    for row in rows:
+        outlist.append(dict(row._mapping))
+    return outlist

backend/database.py

@@ -0,0 +1,262 @@
+# -*- coding: utf_8 -*-
+
+from email.mime import base
+from MySQLdb import Connection
+from sqlalchemy import create_engine, engine, text
+import pandas
+from io import StringIO
+from flask import current_app
+
+song_table = "songs"
+entry_table = "entries"
+index_label = "Id"
+done_table = "done_songs"
+
+sql_engine = None
+
+
+def get_db_engine() -> engine.base.Engine:
+    global sql_engine
+    if (not sql_engine):
+        print(current_app.config.get("DBCONNSTRING"))
+        sql_engine = create_engine(
+            current_app.config.get("DBCONNSTRING"))  # type: ignore
+    return sql_engine
+
+
+def import_songs(song_csv):
+    print("Start importing Songs...")
+    df = pandas.read_csv(StringIO(song_csv), sep=';')
+    with get_db_engine().connect() as conn:
+        df.to_sql(song_table, conn, if_exists='replace',
+                  index=False)
+        cur = conn.execute(text("SELECT Count(Id) FROM songs"))
+        num_songs = cur.fetchone()[0]  # type: ignore
+        conn.commit()
+    print("Imported songs ({} in Database)".format(num_songs))
+    return ("Imported songs ({} in Database)".format(num_songs))
+
+
+def create_entry_table():
+    with get_db_engine().connect() as conn:
+        stmt = text(
+            f'CREATE TABLE IF NOT EXISTS `{entry_table}` (ID INTEGER PRIMARY KEY NOT NULL AUTO_INCREMENT, Song_Id INTEGER NOT NULL, Name VARCHAR(255), Client_Id VARCHAR(36), Transferred INTEGER DEFAULT 0)')
+        conn.execute(stmt)
+        conn.commit()
+
+
+def create_done_song_table():
+    with get_db_engine().connect() as conn:
+        stmt = text(
+            f'CREATE TABLE IF NOT EXISTS `{done_table}` (Song_Id INTEGER PRIMARY KEY NOT NULL,  Plays INTEGER)')
+        conn.execute(stmt)
+        conn.commit()
+
+
+def create_song_table():
+    with get_db_engine().connect() as conn:
+        stmt = text(f"""CREATE TABLE IF NOT EXISTS `{song_table}` (
+        `Id` INTEGER,
+        `Title` TEXT,
+        `Artist` TEXT,
+        `Year` VARCHAR(4),
+        `Duo` BOOLEAN,
+        `Explicit` INTEGER,
+        `Date Added` TIMESTAMP,
+        `Styles` TEXT,
+        `Languages` TEXT
+        )""")
+        conn.execute(stmt)
+        conn.commit()
+
+
+def create_list_view():
+    with get_db_engine().connect() as conn:
+        stmt = text("""CREATE OR REPLACE VIEW `Liste` AS
+                 SELECT Name, Title, Artist, entries.Id AS entry_ID, songs.Id AS song_ID, entries.Transferred
+                 FROM entries, songs
+                 WHERE entries.Song_Id=songs.Id""")
+        conn.execute(stmt)
+        conn.commit()
+
+
+def create_done_song_view():
+    with get_db_engine().connect() as conn:
+        stmt = text("""CREATE OR REPLACE VIEW `Abspielliste` AS
+                 SELECT CONCAT(Artist," - ", Title) AS Song, Plays AS Wiedergaben
+                 FROM songs, done_songs
+                 WHERE done_songs.Song_Id=songs.Id""")
+        conn.execute(stmt)
+        conn.commit()
+
+
+def create_config_table():
+    with get_db_engine().connect() as conn:
+        stmt = text("""CREATE TABLE IF NOT EXISTS `config` (
+        `Key` VARCHAR(50) NOT NULL PRIMARY KEY,
+        `Value` TEXT
+        )""")
+        conn.execute(stmt)
+        conn.commit()
+
+
+def get_list():
+    with get_db_engine().connect() as conn:
+        stmt = text("SELECT * FROM Liste")
+        cur = conn.execute(stmt)
+    return cur.fetchall()
+
+
+def get_played_list():
+    with get_db_engine().connect() as conn:
+        stmt = text("SELECT * FROM Abspielliste")
+        cur = conn.execute(stmt)
+    return cur.fetchall()
+
+
+def get_song_list():
+    with get_db_engine().connect() as conn:
+        stmt = text("SELECT Artist || \" - \" || Title AS Song, Id FROM songs;")
+        cur = conn.execute(stmt)
+    return cur.fetchall()
+
+
+def get_song_completions(input_string):
+    with get_db_engine().connect() as conn:
+        prepared_string = f"%{input_string.upper()}%"
+        stmt = text(
+            "SELECT CONCAT(Artist, ' - ', Title) AS Song, Id FROM songs WHERE CONCAT(Artist, ' - ', Title) LIKE :prepared_string LIMIT 20;")
+        cur = conn.execute(
+            stmt, {"prepared_string": prepared_string})  # type: ignore
+        return cur.fetchall()
+
+
+def add_entry(name, song_id, client_id):
+    with get_db_engine().connect() as conn:
+        stmt = text(
+            "INSERT INTO entries (Song_Id,Name,Client_Id) VALUES (:par_song_id,:par_name,:par_client_id);")
+        conn.execute(stmt, {"par_song_id": song_id, "par_name": name,
+                     "par_client_id": client_id})  # type: ignore
+        conn.commit()
+    return True
+
+
+def add_sung_song(entry_id):
+    with get_db_engine().connect() as conn:
+        stmt = text("SELECT Song_Id FROM entries WHERE Id=:par_entry_id")
+        cur = conn.execute(stmt, {"par_entry_id": entry_id})  # type: ignore
+        song_id = cur.fetchone()[0]  # type: ignore
+        stmt = text(
+            "INSERT INTO done_songs (Song_Id,Plays) VALUES (:par_song_id,1) ON DUPLICATE KEY UPDATE Plays=Plays + 1;")
+        conn.execute(stmt, {"par_song_id": song_id})  # type: ignore
+        conn.commit()
+        delete_entry(entry_id)
+    return True
+
+
+def toggle_transferred(entry_id):
+    with get_db_engine().connect() as conn:
+        cur = conn.execute(text("SELECT Transferred FROM entries WHERE ID = :par_entry_id"),
+                           {"par_entry_id": entry_id})  # type: ignore
+        marked = cur.fetchall()[0][0]
+        if (marked == 0):
+            conn.execute(text("UPDATE entries SET Transferred = 1 WHERE ID = :par_entry_id"),
+                         {"par_entry_id": entry_id})  # type: ignore
+        else:
+            conn.execute(text("UPDATE entries SET Transferred = 0 WHERE ID = :par_entry_id"),
+                         {"par_entry_id": entry_id})  # type: ignore
+        conn.commit()
+    return True
+
+
+def check_entry_quota(client_id):
+    with get_db_engine().connect() as conn:
+        cur = conn.execute(text("SELECT Count(*) FROM entries WHERE entries.Client_Id = :par_client_id"),
+                           {"par_client_id": client_id})  # type: ignore
+    return cur.fetchall()[0][0]
+
+
+def check_queue_length():
+    with get_db_engine().connect() as conn:
+        cur = conn.execute(text("SELECT Count(*) FROM entries"))
+    return cur.fetchall()[0][0]
+
+
+def clear_played_songs():
+    with get_db_engine().connect() as conn:
+        conn.execute(text("DELETE FROM done_songs"))
+        conn.commit()
+    return True
+
+
+def delete_entry(id):
+    with get_db_engine().connect() as conn:
+        conn.execute(text("DELETE FROM entries WHERE id= :par_id"), {
+                     "par_id": id})  # type: ignore
+        conn.commit()
+    return True
+
+
+def delete_entries(ids):
+    idlist = []
+    for x in ids:
+        idlist.append((x,))
+    try:
+        with get_db_engine().connect() as conn:
+            cur = conn.execute(text("DELETE FROM entries WHERE id= :par_id"), {
+                               "par_id": idlist})
+            conn.commit()
+        return cur.rowcount
+    except Exception as error:
+        return -1
+
+
+def delete_all_entries() -> bool:
+    with get_db_engine().connect() as conn:
+        conn.execute(text("DELETE FROM entries"))
+        conn.commit()
+    return True
+
+
+def get_config(key: str) -> str:
+    try:
+        with get_db_engine().connect() as conn:
+            cur = conn.execute(
+                text("SELECT `Value` FROM config WHERE `Key`= :par_key"), {"par_key": key})  # type: ignore
+            conn.commit()
+        return cur.fetchall()[0][0]
+    except IndexError as error:
+        return ""
+
+
+def set_config(key: str, value: str) -> bool:
+    print(f"Setting config {key} to {value}")
+    with get_db_engine().connect() as conn:
+        conn.execute(text(
+            "INSERT INTO config (`Key`, `Value`) VALUES ( :par_key , :par_value) ON DUPLICATE KEY UPDATE `Value`= :par_value"),
+            {"par_key": key, "par_value": value}
+        )  # type: ignore
+        conn.commit()
+    return True
+
+
+def get_config_list() -> dict:
+    with get_db_engine().connect() as conn:
+        cur = conn.execute(text("SELECT * FROM config"))
+        result_dict = {}
+        for row in cur.fetchall():
+            result_dict[row[0]] = row[1]
+    return result_dict
+
+
+def check_config_table() -> bool:
+    with get_db_engine().connect() as conn:
+        if conn.dialect.has_table(conn, 'config'):
+            # type: ignore
+            # type: ignore
+            if (conn.execute(text("SELECT COUNT(*) FROM config")).fetchone()[0] > 0): # type: ignore
+                return True
+            else:
+                return False
+        else:
+            return False

backend/helpers.py

@@ -0,0 +1,173 @@
+import requests
+from bs4 import BeautifulSoup
+import json
+import os
+import uuid
+from flask import make_response, Flask
+from functools import wraps, update_wrapper
+from datetime import datetime
+import database
+
+data_directory = "data"
+config_file = data_directory+"/config.json"
+
+
+def create_data_directory():
+    if not os.path.exists(data_directory):
+        os.makedirs(data_directory)
+
+
+def get_catalog_url():
+    r = requests.get('https://www.karafun.de/karaoke-song-list.html')
+    soup = BeautifulSoup(r.content, 'html.parser')
+    url = soup.findAll(
+        'a', href=True, text='Verfügbar in CSV-Format')[0]['href']
+    return url
+
+
+def get_songs(url):
+    r = requests.get(url)
+    return r.text
+
+
+def is_valid_uuid(val):
+    try:
+        uuid.UUID(str(val))
+        return True
+    except ValueError:
+        return False
+
+
+def check_config_exists():
+    return database.check_config_table()
+
+
+def load_version(app: Flask):
+    if os.environ.get("SOURCE_VERSION"):
+        app.config['VERSION'] = os.environ.get("SOURCE_VERSION")[0:7]  # type: ignore # noqa: E501
+    elif os.path.isfile(".version"):
+        with open('.version', 'r') as file:
+            data = file.read().replace('\n', '')
+            if data:
+                app.config['VERSION'] = data
+            else:
+                app.config['VERSION'] = ""
+    else:
+        app.config['VERSION'] = ""
+
+
+def load_dbconfig(app: Flask):
+    if os.environ.get("FLASK_ENV") == "development":
+        app.config['DBCONNSTRING'] = os.environ.get("DBSTRING")
+    else:
+        if os.environ.get("DEPLOYMENT_PLATFORM") == "Heroku":
+            if os.environ.get("JAWSDB_MARIA_URL"):
+                app.config['DBCONNSTRING'] = os.environ.get("JAWSDB_MARIA_URL")
+            else:
+                app.config['DBCONNSTRING'] = ""
+        if os.environ.get("DEPLOYMENT_PLATFORM") == "Docker":
+            if os.environ.get("DBSTRING"):
+                app.config['DBCONNSTRING'] = os.environ.get("DBSTRING")
+            else:
+                app.config['DBCONNSTRING'] = ""
+        elif os.path.isfile(".dbconn"):
+            with open('.dbconn', 'r') as file:
+                data = file.read().replace('\n', '')
+                if data:
+                    app.config['DBCONNSTRING'] = data
+                else:
+                    app.config['DBCONNSTRING'] = ""
+        else:
+            exit("No database connection string found. Cannot continue. Please set the environment variable DBSTRING or create a file .dbconn in the root directory of the project.")
+
+# Check if config exists in DB, if not, create it.
+
+
+def setup_config(app: Flask):
+    if check_config_exists() == False:
+        print("No config found, creating new config")
+        initial_username = os.environ.get("INITIAL_USERNAME")
+        initial_password = os.environ.get("INITIAL_PASSWORD")
+        if initial_username is None:
+            print(
+                "No initial username set. Please set the environment variable INITIAL_USERNAME")
+            exit()
+        if initial_password is None:
+            print(
+                "No initial password set. Please set the environment variable INITIAL_PASSWORD")
+            exit()
+        default_config = {'username': initial_username,
+                          'password': initial_password,
+                          'entryquota': 3,
+                          'maxqueue': 20,
+                          'entries_allowed': 1,
+                          'theme': 'default.css'}
+        for key, value in default_config.items():
+            database.set_config(key, value)
+        print("Created new config")
+    config = database.get_config_list()
+    app.config['BASIC_AUTH_USERNAME'] = config['username']
+    app.config['BASIC_AUTH_PASSWORD'] = config['password']
+    app.config['ENTRY_QUOTA'] = config['entryquota']
+    app.config['MAX_QUEUE'] = config['maxqueue']
+    app.config['ENTRIES_ALLOWED'] = bool(config['entries_allowed'])
+    app.config['THEME'] = config['theme']
+
+# set queue admittance
+
+
+def set_accept_entries(app: Flask, allowed: bool):
+    if allowed:
+        app.config['ENTRIES_ALLOWED'] = True
+        database.set_config('entries_allowed', '1')
+    else:
+        app.config['ENTRIES_ALLOWED'] = False
+        database.set_config('entries_allowed', '0')
+
+# get queue admittance
+
+
+def get_accept_entries(app: Flask) -> bool:
+    state = bool(int(database.get_config('entries_allowed')))
+    app.config['ENTRIES_ALLOWED'] = state
+    return state
+
+
+# Write settings from current app.config to DB
+def persist_config(app: Flask):
+    config = {'username': app.config['BASIC_AUTH_USERNAME'], 'password': app.config['BASIC_AUTH_PASSWORD'],
+              'entryquota': app.config['ENTRY_QUOTA'], 'maxqueue': app.config['MAX_QUEUE']}
+    for key, value in config.items():
+        database.set_config(key, value)
+
+# Get available themes from themes directory
+
+
+def get_themes():
+    themes = []
+    for theme in os.listdir('./static/css/themes'):
+        themes.append(theme)
+    return themes
+
+# Set theme
+
+
+def set_theme(app: Flask, theme: str):
+    if theme in get_themes():
+        app.config['THEME'] = theme
+        database.set_config('theme', theme)
+    else:
+        print("Theme not found, not setting theme.")
+
+
+def nocache(view):
+    @wraps(view)
+    def no_cache(*args, **kwargs):
+        response = make_response(view(*args, **kwargs))
+        response.headers['Last-Modified'] = datetime.now()  # type: ignore
+        response.headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0, max-age=0'
+        response.headers['Pragma'] = 'no-cache'
+        response.headers['Expires'] = '-1'
+        return response
+
+    return update_wrapper(no_cache, view)

backend/main.py

@@ -0,0 +1,4 @@
+from app import app
+
+if __name__ == "__main__":
+        app.run()

backend/requirements.txt

@@ -0,0 +1,30 @@
+autopep8
+beautifulsoup4
+bs4
+certifi
+charset-normalizer
+click
+Flask
+Flask-BasicAuth
+greenlet
+gunicorn
+idna
+itsdangerous
+Jinja2
+mariadb
+MarkupSafe
+mysql
+mysqlclient
+numpy
+pandas
+pycodestyle
+PyMySQL
+python-dateutil
+pytz
+requests
+six
+soupsieve
+SQLAlchemy
+toml
+urllib3
+Werkzeug

backend/static/css/style.css

@@ -0,0 +1,190 @@
+:root {
+    /* Navbar */
+    --navbar-background-color: #343a40;
+    --navbar-text-color: rgba(255, 255, 255, .5);
+    --navbar-text-color-hover: rgba(255, 255, 255, .75);
+    --navbar-text-color-active: rgba(255, 255, 255, 1);
+
+    /* Common */
+    --background-color: #ffffff;
+    --background-color-var: #f5f5f5;
+    --text-color: #212529;
+    --text-color-var: #343a40;
+
+    /* Modals */
+    --modal-background-color: #ffffff;
+    --modal-separator-color: #dee2e6;
+    --modal-close-color: #212529;
+
+    /* Tables */
+    --table-border-color: #dee2e6;
+
+    /* Input */
+    --input-background-color: #ffffff;
+}
+
+
+body {
+    padding-top: 5rem;
+    background-color: var(--background-color);
+}
+
+html,
+body {
+    height: 100%;
+}
+
+.site {
+    height: auto;
+    min-height: 100%;
+}
+
+main {
+    padding-bottom: 60px;
+    /* Höhe des Footers */
+}
+
+.footer {
+    margin-top: -60px;
+    width: 100%;
+    height: 60px;
+    /* Set the fixed height of the footer here */
+    /*line-height: 60px; /* Vertically center the text there */
+    background-color: var(--background-color-var);
+}
+
+.topbutton {
+    width: 100%;
+}
+
+table td {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+table.entries tbody tr[data-index="0"] {
+    background-color: #007bff80;
+    font-weight: 600;
+}
+
+table.entries tbody tr[data-index="1"] {
+    background-color: #007bff40;
+    font-weight: 500;
+}
+
+table.entries tbody tr[data-index="2"] {
+    background-color: #007bff20;
+    font-weight: 400;
+}
+
+table.entries tbody tr[data-index="3"] {
+    background-color: #007bff10;
+}
+
+table td:first-child {
+    max-width: 200px !important;
+}
+
+.fa-solid {
+    vertical-align: auto;
+}
+
+@media (min-width: 768px) {
+    .topbutton {
+        width: auto;
+    }
+}
+
+@media print {
+    body {
+        font-size: 1.3em;
+    }
+
+    .footer {
+        display: none !important;
+    }
+
+    .admincontrols {
+        display: none;
+    }
+}
+
+body {
+    background-color: var(--background-color);
+    color: var(--text-color);
+}
+
+.footer {
+    background-color: var(--background-color-var);
+}
+
+.modal-content {
+    background-color: var(--background-color);
+    color: var(--text-color);
+}
+
+.modal-header {
+    background-color: var(--background-color);
+    color: var(--text-color-var);
+    border-color: var(var(--modal-separator-color));
+}
+
+.modal-footer {
+    background-color: var(--background-color);
+    color: var(--text-color-var);
+    border-color: var(var(--modal-separator-color));
+}
+
+.form-control {
+    background-color: var(--input-background-color);
+    color: var(--text-color)
+}
+
+.form-control:focus {
+    background-color: var(--input-background-color);
+    color: var(--text-color)
+}
+
+.table td,
+.table th {
+    border-color: var(--table-border-color)
+}
+
+.table thead th {
+    border-color: var(--table-border-color)
+}
+
+.close {
+    color: var(--text-color)
+}
+
+pre {
+    color: var(--text-color-var)
+}
+
+@media (prefers-color-scheme: dark) {
+    :root {
+        /* Navbar */
+        --navbar-background-color: #343a40;
+        --navbar-text-color: rgba(255, 255, 255, .5);
+        --navbar-text-color-hover: rgba(255, 255, 255, .75);
+        --navbar-text-color-active: rgba(255, 255, 255, 1);
+
+        /* Common */
+        --background-color: #121212;
+        --background-color-var: #232323;
+        --text-color: #f5f5f5;
+        --text-color-var: #a2a2a2;
+
+        /* Modals */
+        --modal-background-color: #121212;
+        --modal-separator-color: #232323;
+        --modal-close-color: #f5f5f5;
+
+        /* Tables */
+        --table-border-color: #232323;
+
+        /* Input */
+        --input-background-color: #343434;
+    }
+}

backend/static/css/themes/stuk.css

@@ -0,0 +1,91 @@
+.navbar {
+    background: #090a28 !important;
+}
+
+.navbar .navbar-toggle:hover,
+.navbar .navbar-toggle:focus {
+    background-color: #900000 !important;
+}
+
+.navbar .navbar-toggle {
+    border: none;
+}
+
+.navbar .navbar-nav>.open>a,
+.navbar .navbar-nav>.open>a:hover,
+.navbar .navbar-nav>.open>a:focus {
+    color: #CF2323 !important;
+    background-color: #050515 !important;
+}
+
+.btn-primary {
+    background-color: #15175b;
+    border-color: #15175b;
+}
+
+.btn-primary:hover,
+.btn-primary:focus {
+    background-color: #0e103e;
+    background-position: 0 -15px;
+}
+
+.btn-primary:active,
+.btn-primary.active {
+    background-color: #0e103e;
+    border-color: #0e103e;
+}
+
+.btn-primary.disabled,
+.btn-primary:disabled,
+.btn-primary[disabled] {
+    background-color: #0e103e;
+    background-image: none;
+}
+
+.dropdown-menu>li>a:hover,
+.dropdown-menu>li>a:focus {
+    color: #8A0711;
+}
+
+.dropdown-menu>.active>a,
+.dropdown-menu>.active>a:hover,
+.dropdown-menu>.active>a:focus {
+    background-color: #2e6da4;
+    background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+    background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
+    background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
+    background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
+    background-repeat: repeat-x;
+}
+
+.navbar .navbar-nav>li>a:hover {
+    color: #b60000;
+}
+
+.form-control:focus {
+    border-color: rgba(21, 23, 91, 0.8);
+    outline: 0;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075),
+    0 0 8px rgba(21, 23, 91, 0.6);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075) inset,
+    0 0 8px rgba(21, 23, 91, 0.6);
+}
+
+a {
+    color: #900000;
+}
+
+a:hover,
+a:focus {
+    color: #670000;
+}
+
+.navbar-brand {
+    display: flex;
+    align-items: center;
+}
+
+.navbar-brand > img {
+    height: 4rem;
+}

backend/static/manifest.webmanifest

@@ -2,12 +2,13 @@
     "name": "KaraoQueue",
     "short_name": "KaraoQueue",
     "start_url": "/",
+    "url": "https://karaoqueue-323511.appspot.com/",
     "display": "standalone",
     "background_color": "#343a40",
     "description": "Eine Karaokewarteliste.",
     "icons": [{
-        "src": "images/touch/homescreen192.png",
-        "sizes": "192x192",
+        "src": "images/touch/homescreen512.png",
+        "sizes": "512x512",
         "type": "image/png"
     }],
     "related_applications": [{

backend/templates/base.html

@@ -6,13 +6,14 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="description" content="">
     <meta name="author" content="">
+    <meta name="color-scheme" content="light dark" />
     <link rel="icon" href="favicon.ico">
     <link rel="manifest" href="/static/manifest.webmanifest">
 
     <title>{% block title %}{% endblock %} - KaraoQueue</title>
-    
+
     <!-- Bootstrap-Tables -->
-    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.15.3/dist/bootstrap-table.min.css">
+    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.21.2/dist/bootstrap-table.min.css">
 
     <!-- Bootstrap core CSS -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
@@ -22,12 +23,16 @@
     <link href="static/css/style.css" rel="stylesheet">
 
     <!-- Fontawesome Icons -->
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css"
-        integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"
+        integrity="sha512-iecdLmaskl7CVkqkXNQ/ZH/XLlvWZOJyj7Yy7tcenmpD1ypASozpmT/E0iPtmFIB46ZmdtAc9eNBvH0H/ZpiBw=="
+        crossorigin="anonymous" referrerpolicy="no-referrer" />
 
     <!-- Bootstraptoggle -->
     <link href="https://gitcdn.github.io/bootstrap-toggle/2.2.2/css/bootstrap-toggle.min.css" rel="stylesheet">
 
+    <!-- Active Theme -->
+    <link href="static/css/themes/{{config['THEME']}}" rel="stylesheet">
+
 </head>
 
 <body>
@@ -51,6 +56,9 @@
                 <li class="nav-item">
                     <a class="nav-link" href="/plays">Abspielliste</a>
                 </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="/settings">Einstellungen</a>
+                </li>
                 {% endif %}
             </ul>
             <!--<form class="form-inline my-2 my-lg-0">
@@ -68,12 +76,11 @@
     <footer class="footer">
         <div class="container text-center py-3">
             {% if not auth %}
-                <a href="/login" class="ml-1 mr-1"><i
-                        class="fas fa-sign-in-alt mr-1"></i><span>Login</span></a>
+            <a href="/login" class="ml-1 mr-1"><i class="fas fa-sign-in-alt mr-1"></i><span>Login</span></a>
             {% endif %}
-            <!--<a href="https://github.com/PhoenixTwoFive/karaoqueue"
-                class="ml-1 mr-1"><i class="fab fa-github mr-1"></i><span>Github</span></a>-->
-            <span class="text-muted">KaraoQueue (stale branch) -&nbsp;<span>&copy</span>&nbsp;2019-2021 - Phillip
+            <a href="https://github.com/PhoenixTwoFive/karaoqueue"
+                class="ml-1 mr-1"><i class="fab fa-github mr-1"></i><span>Github</span></a>
+            <span class="text-muted"> {{karaoqueue_version}} -&nbsp;2019-23 - Phillip
                 Kühne</span>
         </div>
     </footer>
@@ -83,28 +90,46 @@
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="https://code.jquery.com/jquery-3.2.1.min.js"
         integrity="sha384-xBuQ/xzmlsLoJpyjoggmTEz8OWUFM0/RC5BsqQBDX2v5cMvDHcMakNTNrHIW2I5f" crossorigin="anonymous">
-    </script>
-    
+        </script>
+
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"
         integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous">
-    </script>
+        </script>
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"
         integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous">
-    </script>
+        </script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.4.0/bootbox.min.js"
         integrity="sha256-4F7e4JsAJyLUdpP7Q8Sah866jCOhv72zU5E8lIRER4w=" crossorigin="anonymous">
-    </script>
-    <script src="https://unpkg.com/bootstrap-table@1.15.3/dist/bootstrap-table.min.js"></script>
-    <script src="https://unpkg.com/bootstrap-table@1.15.3/dist/extensions/auto-refresh/bootstrap-table-auto-refresh.min.js"></script>
+        </script>
+    <script src="https://unpkg.com/bootstrap-table@1.21.2/dist/bootstrap-table.min.js"></script>
+    <script
+        src="https://unpkg.com/bootstrap-table@1.21.2/dist/extensions/auto-refresh/bootstrap-table-auto-refresh.min.js"></script>
     <script src="https://gitcdn.github.io/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js"></script>
     {% block extrajs %}{% endblock %}
     <script>
         $(document).ready(function () {
+            loadOrGenerateClientId()
             // get current URL path and assign 'active' class
             var pathname = window.location.pathname;
             $('.navbar-nav > li > a[href="' + pathname + '"]').parent().addClass('active');
             $('[data-toggle="tooltip"]').tooltip()
         })
+
+        function create_UUID() {
+            var dt = new Date().getTime();
+            var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+                var r = (dt + Math.random() * 16) % 16 | 0;
+                dt = Math.floor(dt / 16);
+                return (c == 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+            });
+            return uuid;
+        }
+
+        function loadOrGenerateClientId() {
+            if (!localStorage.getItem("clientId")) {
+                localStorage.setItem("clientId", create_UUID())
+            }
+        }
     </script>
 </body>
 

backend/templates/main_admin.html

@@ -0,0 +1,205 @@
+{% extends 'base.html' %}
+{% block title %}Warteliste-Admin{% endblock %}
+{% block content %}
+<style>
+    table td:nth-child(2) {
+        overflow-y: hidden;
+        overflow-x: auto;
+        text-overflow: clip;
+        max-width: 200px !important;
+    }
+</style>
+<div class="container">
+    <div id="toolbar">
+        <button type="button" class="topbutton btn btn-danger" onclick="confirmDeleteSelectedEntries()"><i
+                class="fas fa-trash mr-2"></i>Gewählte Einträge löschen</button>
+        <button type="button" class="topbutton btn btn-danger" onclick="confirmUpdateSongDatabase()"><i
+                class="fas fa-file-import mr-2"></i>Song-Datenbank
+            aktualisieren</button>
+        <input id="entryToggle" type="checkbox" class="topbutton" data-toggle="toggle" data-on="Eintragen erlaubt"
+            data-off="Eintragen deaktiviert" data-onstyle="success" data-offstyle="danger">
+    </div>
+    <table class="table entries" id="entrytable" data-toggle="table" data-search="true" data-show-columns="true"
+        data-show-toggle="true" data-multiple-select-row="true" data-click-to-select="true" data-toolbar="#toolbar"
+        data-pagination="true" data-show-extended-pagination="true" data-classes="table table-hover"
+        data-url="/api/queue" data-show-refresh="true" data-auto-refresh="true" data-auto-refresh-interval="10">
+        <thead>
+            <tr>
+                <th data-field="state" data-checkbox="true"></th>
+                <th scope="col" data-field="Name">Name</th>
+                <th scope="col" data-field="Title">Song</th>
+                <th scope="col" data-field="Artist">Künstler</th>
+                <th scope="col" data-formatter="TableActions">Aktionen</th>
+            </tr>
+        </thead>
+    </table>
+    <a name="end"></a>
+</div>
+{% endblock %}
+{% block extrajs %}
+<script>
+    $(function () {
+        refreshEntryToggle()
+        $('#entryToggle').change(function () {
+            $.ajax({ url: "/api/entries/accept/" + ($('#entryToggle').is(":checked") ? "1" : "0"), complete: setTimeout(refreshEntryToggle, 1000) });
+        })
+        $("#entrytable").bootstrapTable().on('load-success.bs.table', function () {
+            $('[data-toggle="tooltip"]').tooltip()
+        })
+        $('[data-toggle="tooltip"]').tooltip({
+            trigger: 'hover'
+        })
+    })
+    function confirmDeleteEntry(name, entry_id) {
+        bootbox.confirm("Wirklich den Eintrag von " + name + " löschen?", function (result) {
+            if (result) {
+                deleteEntry(entry_id)
+            }
+        })
+    }
+    function confirmDeleteSelectedEntries() {
+        bootbox.confirm({
+            message: "Wirklich gewählte Eintragungen löschen?",
+            buttons: {
+                confirm: {
+                    label: 'Ja',
+                    className: 'btn btn-danger'
+                },
+                cancel: {
+                    label: 'Nein',
+                    className: 'btn btn-secondary'
+                }
+            },
+            callback: function (result) {
+                if (result) {
+                    DeleteSelectedEntries(getIdSelections())
+                }
+            }
+        })
+    }
+    function confirmUpdateSongDatabase() {
+        bootbox.confirm({
+            message: "Wirklich die Song-Datenbank aktualisieren?<br>Dies lädt die Aktuelle Song-Liste von <a href='https://www.karafun.de/karaoke-song-list.html'>KaraFun</a> herunter, <b>und wird alle Eintragungen löschen!</b>",
+            buttons: {
+                confirm: {
+                    label: 'Ja',
+                    className: 'btn-primary'
+                },
+                cancel: {
+                    label: 'Nein',
+                    className: 'btn btn-secondary'
+                }
+            },
+            callback: function (result) {
+                if (result) {
+                    var dialog = bootbox.dialog({
+                        message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Aktualisiere Song-Datenbank...</p>',
+
+                        closeButton: false
+                    });
+                    updateSongDatabase(dialog)
+                }
+            }
+        })
+    }
+    function refreshEntryToggle() {
+        $.getJSON("/api/entries/accept", (data) => {
+            if (data["value"] != $('#entryToggle').is(":checked")) {
+                if (data["value"] == 1) {
+                    $('#entryToggle').data('bs.toggle').on('true')
+                }
+                else {
+                    $('#entryToggle').data('bs.toggle').off('true')
+                }
+            }
+        })
+    }
+    function deleteEntry(entry_id) {
+        $.ajax({
+            type: 'GET',
+            url: '/api/entries/delete/' + entry_id,
+            contentType: "application/json",
+            dataType: 'json',
+            async: false
+        });
+        $("#entrytable").bootstrapTable('refresh')
+
+    }
+    function markEntryAsSung(entry_id) {
+        $.ajax({
+            type: 'GET',
+            url: '/api/entries/mark_sung/' + entry_id,
+            contentType: "application/json",
+            dataType: 'json',
+            async: false
+        });
+        $("#entrytable").bootstrapTable('refresh')
+
+    }
+
+    function markEntryAsTransferred(entry_id) {
+        $.ajax({
+            type: 'GET',
+            url: '/api/entries/mark_transferred/' + entry_id,
+            contentType: "application/json",
+            dataType: 'json',
+            async: false
+        });
+        $("#entrytable").bootstrapTable('refresh')
+
+    }
+
+    function DeleteSelectedEntries(ids) {
+        $.ajax({
+            type: 'POST',
+            url: '/api/entries/delete',
+            data: JSON.stringify(ids), // or JSON.stringify ({name: 'jonas'}),
+            error: function () {
+                bootbox.alert({
+                    message: "Fehler beim Löschen der Eintragungen.",
+                })
+            },
+            success: function () {
+                $("#entrytable").bootstrapTable('refresh')
+
+            },
+            contentType: "application/json",
+            dataType: 'json'
+        });
+    }
+    function updateSongDatabase(wait_dialog) {
+        $.ajax({
+            type: 'GET',
+            url: '/api/songs/update',
+            contentType: "application/json",
+            dataType: 'json',
+            success: function (data) {
+                wait_dialog.modal('hide')
+                bootbox.alert({
+                    message: data["status"],
+                    callback: function () {
+                        $("#entrytable").bootstrapTable('refresh')
+                    }
+                })
+            }
+        });
+    }
+    function TableActions(value, row, index) {
+        console.log("Value: " + value + ", Row: " + row + ", Index: " + index)
+        console.log(row)
+        let outerHTML = ""
+        if (row.Transferred == 1) {
+            outerHTML = "<button type=\"button\" class=\"btn btn-default\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Markierung zurückziehen\" onclick=\"event.stopPropagation();$(this).tooltip('dispose');markEntryAsTransferred(" + row.entry_ID + ")\"><i class=\"fas fa-backward\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-success\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Als gesungen markieren\" onclick=\"event.stopPropagation();$(this).tooltip('dispose');markEntryAsSung(" + row.entry_ID + ")\"><i class=\"fas fa-check\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-danger\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Eintrag löschen\" onclick=\"event.stopPropagation();$(this).tooltip('dispose');confirmDeleteEntry('" + row.Name + "'," + row.entry_ID + ")\"><i class=\"fas fa-trash\"></i></button>";
+        } else {
+            outerHTML = "<button type=\"button\" class=\"btn btn-info\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Als übertragen markieren\" onclick=\"event.stopPropagation();$(this).tooltip('dispose');markEntryAsTransferred(" + row.entry_ID + ")\"><i class=\"fas fa-exchange-alt\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-success\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Als gesungen markieren\" onclick=\"event.stopPropagation();$(this).tooltip('dispose');markEntryAsSung(" + row.entry_ID + ")\"><i class=\"fas fa-check\"></i></button>&nbsp;<button type=\"button\" class=\"btn btn-danger\" data-toggle=\"tooltip\" data-placement=\"top\" title=\"Eintrag löschen\" onclick=\"event.stopPropagation();$(this).tooltip('dispose');confirmDeleteEntry('" + row.Name + "'," + row.entry_ID + ")\"><i class=\"fas fa-trash\"></i></button>";
+        }
+        return outerHTML;
+    }
+
+    function getIdSelections() {
+        return $.map($("#entrytable").bootstrapTable('getSelections'), function (row) {
+            return row.entry_ID
+        })
+    }
+</script>
+{% endblock %}

backend/templates/settings.html

@@ -0,0 +1,41 @@
+{% extends 'base.html' %}
+{% block title %}Einstellungen{% endblock %}
+{% block content %}
+<form method="post">
+    <p>
+        <label for="entryquota">Maximale Anzahl an Einträgen pro Nutzer</label>
+        <input type="number" class="form-control" id="entryquota" name="entryquota" min=1 value={{app.config['ENTRY_QUOTA']}}>
+    </p>
+    <p>
+        <label for="maxqueue">Maximale Anzahl an Einträgen Insgesamt</label>
+        <input type="number" class="form-control" id="maxqueue" name="maxqueue" min=1 value={{app.config['MAX_QUEUE']}}>
+    </p>
+    <p>
+        <label for="theme">Aktives Theme</label>
+        <select class="form-control" id="theme" name="theme">
+            {% for theme in themes %}
+            <option value="{{theme}}" {% if theme == config['THEME'] %}selected{% endif %}>{{theme}}</option>
+            {% endfor %}
+        </select>
+    </p>
+    <div class="alert alert-warning" role="alert">
+        <i class="fas fa-exclamation-triangle mr-1"></i>
+        <strong>Warnung:</strong> Änderungen an den folgenden Einstellungen führen zu einer sofortigen Abmeldung!
+    </div>
+    <p>
+        <label for="username">Benutzername</label>
+        <input type="text" class="form-control" id="username" name="username" value={{app.config['BASIC_AUTH_USERNAME']}}>
+    </p>
+    <p>
+        <label for="password">Passwort ändern</label>
+        <input type="password" class="form-control" id="password" name="password">
+    </p>
+    <input type="submit" class="btn btn-primary mr-1 mb-2" value="Einstellungen anwenden">
+</form>
+<details>
+    <summary>Current config:</summary>
+    <pre>{% for key, val in config.items() %}{{key}}: {{val}}<br>{% endfor %}</pre>
+</details>
+{% endblock %}
+{% block extrajs %}
+{% endblock %}

backend/templates/songlist.html

@@ -17,8 +17,8 @@
                 </button>
             </div>
             <div class="form-group">
-            <form id="nameForm">
-                <div class="modal-body">
+                <form id="nameForm">
+                    <div class="modal-body">
                         <label for="singerNameInput">Sängername</label>
                         <input type="text" class="form-control" id="singerNameInput" placeholder="Max Mustermann"
                             required>
@@ -28,7 +28,7 @@
                         <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
                         <button type="submit" class="btn btn-primary" id="submitSongButton">Anmelden</button>
                     </div>
-            </form>
+                </form>
             </div>
         </div>
     </div>
@@ -38,22 +38,22 @@
 <script>
     $(document).ready(function () {
         $("#filter").focus();
-        $("#filter").keyup( function () {
+        $("#filter").keyup(function () {
             var value = $(this).val().toLowerCase();
             //alert(value);
-            if(value.length >= 1) {
+            if (value.length >= 1) {
                 $.getJSON("/api/songs/compl", { search: value }, function (data) {
                     var items = [];
                     $.each(data, function (key, val) {
-                        items.push("<tr><td>"+val[0]+`</td>
-                            <td><button type='button'
+                        items.push("<tr><td>" + val[0] + `</td>
+                            <td class='buttoncell'><button type='button'
                                     class='btn btn-primary justify-content-center align-content-between enqueueButton'
                                     data-toggle='modal'
-                                    data-target='#enqueueModal' onclick='setSelectedId(`+val[1]+`)'><i
+                                    data-target='#enqueueModal' onclick='setSelectedId(`+ val[1] + `)'><i
                                         class="fas fa-plus"></i></button></td>
                         </tr>`)
                     });
-    
+
                     $("#songtable").html("")
                     $(items.join("")).appendTo("#songtable");
                     entriesAccepted()
@@ -63,17 +63,18 @@
             }
         });
 
-        $("#nameForm").submit( function (e) {
+        $("#nameForm").submit(function (e) {
             e.preventDefault();
             submitModal();
         });
     });
 
-    
-    function enqueue(id,name,success_callback, blocked_callback) {
+
+    function enqueue(client_id, id, name, success_callback, blocked_callback) {
         var data = {
             "name": name,
-            "id": id
+            "id": id,
+            "client_id": client_id
         }
         $.ajax({
             type: 'POST',
@@ -87,43 +88,49 @@
             dataType: 'json'
         });
     }
-    
+
     function setSelectedId(id) {
-        $("#selectedId").attr("value",id);
+        $("#selectedId").attr("value", id);
     }
-    
+
     function submitModal() {
         var name = $("#singerNameInput").val();
         var id = $("#selectedId").attr("value");
-        enqueue(id,name,function () {
+        enqueue(localStorage.getItem("clientId"),id, name, function () {
             $("#enqueueModal").modal('hide');
             window.location.href = '/#end';
-        }, function () {
+        }, function (response) {
             bootbox.alert({
-                    message: "Es werden leider keine neuen Anmeldungen mehr angenommen. Tut mir leid :(",
-                });
-            $(".enqueueButton").prop("disabled",true);
+                message: "Deine Eintragung konnte leider nicht vorgenommen werden.\nGrund: "+response.responseJSON.status,
+            });
+            entriesAccepted();
             $("#enqueueModal").modal('hide');
 
         });
-        
+
 
     }
 
+    {% if not auth %}
     function entriesAccepted() {
-        $.getJSON("/api/entries/accept", (data,out) => {
-            if(data["value"]==0) {
-                $(".enqueueButton").prop("disabled",true)
-                $(".enqueueButton").prop("style","pointer-events: none;")
-                $(".enqueueButton").wrap("<span class='tooltip-span' tabindex='0' data-toggle='tooltip' data-placement='top'></span>" );
-                $(".tooltip-span").prop("title","Eintragungen sind leider nicht mehr möglich.")
+        $.getJSON("/api/entries/accept", (data, out) => {
+            if (data["value"] == 0) {
+                $(".enqueueButton").prop("disabled", true)
+                $(".enqueueButton").prop("style", "pointer-events: none;")
+                $(".enqueueButton").wrap("<span class='tooltip-span' tabindex='0' data-toggle='tooltip' data-placement='top'></span>");
+                $(".tooltip-span").prop("title", "Eintragungen sind leider nicht mehr möglich.")
                 $('[data-toggle="tooltip"]').tooltip()
             } else {
-                $(".enqueueButton").prop("disabled",false)
+                $(".enqueueButton").prop("disabled", false)
             }
-            
+
         })
     }
+    {% else %}
+    function entriesAccepted() {
+        $(".enqueueButton").prop("disabled", false)
+    }
+    {% endif %}
 
 </script>
 {% endblock %}

docker-compose.prod.yml

@@ -0,0 +1,23 @@
+version: "3.9"
+
+secrets:
+  secrets:
+    file: ./secrets.yml
+
+services:
+  karaoqueue:
+    image: "ghcr.io/phoenixtwofive/karaoqueue:v2023.03"
+    build: .
+    restart: always
+    ports:
+      - "127.0.0.1:8081:80" # Please put a reverse proxy in front of this
+    env_file: .env
+  db:
+    image: mariadb
+    restart: always
+    env_file: .env 
+    volumes:
+    - karaoqueue-db:/var/lib/mysql
+
+volumes:
+  karaoqueue-db:

docker-compose.yml

@@ -0,0 +1,15 @@
+# This Compose file is for development only. It is not intended for production use.
+# It only starts auxiliary services, such as a database, that are required for the
+# application to run. The application itself is started separately, using the
+# command "python -m flask run" or your favorite IDE.
+# Useful for attaching a debugger to the application.
+
+version: "3.9"
+
+services:
+  db:
+    image: mariadb
+    restart: always
+    env_file: .env.dev
+    ports:
+      - "3306:3306"