backend/app.py

@@ -32,9 +32,11 @@ def favicon():
 @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'].strip()
     song_id = request.json['id']
@@ -44,9 +46,11 @@ def enqueue():
     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']
@@ -199,6 +203,7 @@ def get_stats():
 # Return data from long_term_stats as csv
 def get_stats_csv():
     db_result = database.get_long_term_stats()
+    print(db_result)
     csv = "Id,Playbacks\n"
     for row in db_result:
         csv += str(row[0]) + "," + str(row[1]) + "\n"
@@ -253,11 +258,14 @@ def delete_entry_admin(entry_id):
 @nocache
 def delete_entry_user(entry_id):
     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)
     if database.get_raw_entry(entry_id)[3] != client_id:  # type: ignore
+        print(request.data)
         abort(403)
     if database.delete_entry(entry_id):
         return Response('{"status": "OK"}', mimetype='text/json')
@@ -270,6 +278,7 @@ def delete_entry_user(entry_id):
 @basic_auth.required
 def delete_entries():
     if not request.json:
+        print(request.data)
         abort(400)
         return
     updates = database.delete_entries(request.json)

backend/database.py

@@ -299,6 +299,7 @@ def transfer_playbacks():
                     UPDATE Playbacks = lts.Playbacks + VALUES(Playbacks);
                     """)
         result = conn.execute(stmt)
+        print(result)
         conn.commit()
     return True
 

backend/templates/base.html

@@ -13,7 +13,7 @@
     <title>{% block title %}{% endblock %} - KaraoQueue</title>
 
     <!-- Bootstrap-Tables -->
-    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.22.2/dist/bootstrap-table.min.css">
+    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.21.2/dist/bootstrap-table.min.css">
 
     <!-- Bootstrap-Toaster-->
     <link rel="stylesheet"
@@ -22,8 +22,8 @@
         crossorigin="anonymous" referrerpolicy="no-referrer" />
 
     <!-- Bootstrap core CSS -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css"
-        integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/css/bootstrap.min.css"
+        integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
 
     <!-- Custom styles for this template -->
     <link href="static/css/style.css" rel="stylesheet">
@@ -86,7 +86,7 @@
             {% 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_version}} -&nbsp;2019-24 - <span id="myName">Phillip
+            <span class="text-muted"> {{karaoqueue_version}} -&nbsp;2019-23 - <span id="myName">Phillip
                 Kühne</span></span>
         </div>
     </footer>
@@ -101,15 +101,15 @@
     <script src="https://cdn.jsdelivr.net/npm/popper.js@1.14.6/dist/umd/popper.min.js"
         integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut"
         crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/js/bootstrap.min.js"
-        integrity="sha384-+sLIOodYLS7CIrQpBjl+C7nPvqq+FbNUBDunl/OZv93DB7Ln/533i8e/mZXLi/P+"
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/js/bootstrap.min.js"
+        integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k"
         crossorigin="anonymous"></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.22.2/dist/bootstrap-table.min.js"></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.22.2/dist/extensions/auto-refresh/bootstrap-table-auto-refresh.min.js"></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>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-toaster/4.1.2/js/bootstrap-toaster.min.js"
@@ -187,14 +187,6 @@
             return entries;
         }
 
-        function dataRequestQueueAndDestroyTooltips(params) {
-          document.querySelectorAll(".tooltip[role='tooltip']").forEach((tooltip) => tooltip.remove());
-          var base_url = "/api/queue"
-          $.get(base_url).then((res) => {
-            params.success(res);
-          });
-        }
-
     </script>
 </body>
 

backend/templates/main.html

@@ -4,7 +4,7 @@
 <a id="bfb" role="button" class="btn btn-primary btn-lg btn-block mb-2" href="/list">Eintragen</a>
 <table class="table entries"
         data-toggle="table"
-        data-ajax="dataRequestQueueAndDestroyTooltips"
+        data-url="/api/queue"
         data-pagination="true"
         data-classes="table"
     data-show-refresh="false"

backend/templates/main_admin.html

@@ -22,7 +22,7 @@
     <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-ajax="dataRequestQueueAndDestroyTooltips" data-show-refresh="true" data-auto-refresh="true" data-auto-refresh-interval="10">
+        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>
@@ -153,7 +153,7 @@
         $.ajax({
             type: 'POST',
             url: '/api/entries/delete',
-            data: JSON.stringify(ids),
+            data: JSON.stringify(ids), // or JSON.stringify ({name: 'jonas'}),
             error: function () {
                 bootbox.alert({
                     message: "Fehler beim Löschen der Eintragungen.",