mirror of
https://github.com/PhoenixTwoFive/karaoqueue.git
synced 2025-07-01 15:51:41 +02:00
Compare commits
133 Commits
v2021.08
...
new_fronte
Author | SHA1 | Date | |
---|---|---|---|
1a63232401
|
|||
8183dcfcf4
|
|||
81b36e7f1a
|
|||
3c3795e25a
|
|||
7a7a647be3
|
|||
484b7cdfcd
|
|||
c8a7979132
|
|||
45e5fd853e
|
|||
5c66451524
|
|||
abc06d3181
|
|||
2b4cabcb98
|
|||
b3670aa0e0
|
|||
ba982001ba
|
|||
d1ec708780
|
|||
f901708896
|
|||
f0a7ee2d2b
|
|||
bc5818f50d
|
|||
a1264cb15b
|
|||
2e1eab3e2a
|
|||
b69e771b75
|
|||
7d8ae1167e
|
|||
b9e0302443
|
|||
bb25b2801b
|
|||
4d75c125ba
|
|||
5050e0cf60
|
|||
3be307c0f9
|
|||
8cc9ed3645
|
|||
108d70253c
|
|||
527c9d451d
|
|||
5beb752edf
|
|||
589e50120b
|
|||
f421423636
|
|||
f6901a6175
|
|||
895dd14073
|
|||
95838885e7
|
|||
84badb0e13
|
|||
10613d5c67 | |||
5bcf73a871 | |||
645052027c | |||
bf96424853 | |||
d0e9e31a8c | |||
415758b94d | |||
89fca235ed | |||
020a06d381 | |||
e09a9db75f | |||
654b8743d1 | |||
3d8dfc9fe2 | |||
a642beee31 | |||
8d42db22b4 | |||
d7de33063e | |||
607abc28f4 | |||
4a1a2df725 | |||
7cc614b496 | |||
e4de261dfa | |||
7e66a42f9a | |||
f4c9b8d26a | |||
99c7917573 | |||
23e7bf71bc | |||
360b61fe21 | |||
bf1b711abe | |||
65635f57a8 | |||
013dcecba9 | |||
d79eebc949 | |||
c203317320 | |||
4b70b70a1d | |||
69f84332e6 | |||
6a7b07ac9f | |||
ba4b5fb57c | |||
e6bc974a6f | |||
569daf0a04 | |||
78a39b8d17 | |||
14ce3e07f5 | |||
573b7a69da | |||
da505e93a3 | |||
ea7fba17a2 | |||
f3bf925e3d | |||
d84eea9683 | |||
48b9bc843d | |||
a9e16742e0 | |||
02a66ba522 | |||
f61df3e5ef | |||
80682ab883 | |||
ba02a01838 | |||
7cecf3a7a7 | |||
f2b5dc93e2 | |||
b28dbba746 | |||
3990741131 | |||
f552f8fefd | |||
5e93f8592c | |||
d0e90a5003 | |||
60dfea50c4 | |||
1edc1b67bb | |||
96f12b65c7 | |||
711745cd46 | |||
4a52d5407f | |||
a95ee7ccec | |||
4a820e96fd | |||
e834a85375 | |||
0a438d96f6 | |||
e155078502 | |||
097a5328e3 | |||
c6c6b5da00 | |||
c5e8ae0649 | |||
91d02331f4 | |||
7212f46191 | |||
27eb10d222 | |||
a8ded945e2 | |||
9ad74552fe | |||
578adaf893 | |||
673fde9ee6 | |||
e61c7a40cc | |||
013c52be61 | |||
ecd08d20ef | |||
d3aea64880 | |||
8687408d9c | |||
ff3a1a3523 | |||
085f4dae96 | |||
27f15713cf | |||
c0c6fb8b06 | |||
869166f818 | |||
ca3d5f8a77 | |||
e989189055 | |||
281e8b5211 | |||
e78e9da24c | |||
9317563047 | |||
c7fd25fae5 | |||
8780e6c595 | |||
8652abe8dc | |||
83a8c963a3 | |||
e9f43c0169 | |||
a8871c1106 | |||
dc03dab0ce | |||
160a64fc4a |
3
.gitignore
vendored
3
.gitignore
vendored
@ -135,3 +135,6 @@ data/
|
|||||||
# Node Modules
|
# Node Modules
|
||||||
|
|
||||||
node_modules/
|
node_modules/
|
||||||
|
|
||||||
|
# Version identification file
|
||||||
|
.version
|
58
.vscode/launch.json
vendored
58
.vscode/launch.json
vendored
@ -4,35 +4,71 @@
|
|||||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"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": "versiondump",
|
||||||
|
"name": "Python: Flask",
|
||||||
"type": "python",
|
"type": "python",
|
||||||
|
"cwd": "${workspaceFolder}/backend",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"module": "flask",
|
"module": "flask",
|
||||||
"env": {
|
"env": {
|
||||||
"FLASK_APP": "backend/app/main.py",
|
"FLASK_APP": "backend/app.py",
|
||||||
"FLASK_ENV": "development",
|
"FLASK_ENV": "development",
|
||||||
"FLASK_DEBUG": "1"
|
"FLASK_DEBUG": "1"
|
||||||
},
|
},
|
||||||
"args": [
|
"args": [
|
||||||
"run",
|
"run",
|
||||||
"--no-debugger",
|
"--no-debugger",
|
||||||
"--host='0.0.0.0'"
|
"--no-reload"
|
||||||
],
|
],
|
||||||
"jinja": true
|
"jinja": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Python: Flask (externally reachable)",
|
"preLaunchTask": "versiondump",
|
||||||
|
"name": "Python: Flask (with reload)",
|
||||||
"type": "python",
|
"type": "python",
|
||||||
|
"cwd": "${workspaceFolder}/backend",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"module": "flask",
|
"module": "flask",
|
||||||
"env": {
|
"env": {
|
||||||
"FLASK_APP": "backend/app/main.py",
|
"FLASK_APP": "backend/app.py",
|
||||||
|
"FLASK_ENV": "development",
|
||||||
|
"FLASK_DEBUG": "1"
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"run",
|
||||||
|
"--no-debugger"
|
||||||
|
],
|
||||||
|
"jinja": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"preLaunchTask": "versiondump",
|
||||||
|
"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"
|
||||||
|
},
|
||||||
|
"args": [
|
||||||
|
"run",
|
||||||
|
"--no-debugger",
|
||||||
|
"--host=0.0.0.0"
|
||||||
|
],
|
||||||
|
"jinja": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"preLaunchTask": "versiondump",
|
||||||
|
"name": "Python: Flask (externally reachable)",
|
||||||
|
"type": "python",
|
||||||
|
"cwd": "${workspaceFolder}/backend",
|
||||||
|
"request": "launch",
|
||||||
|
"module": "flask",
|
||||||
|
"env": {
|
||||||
|
"FLASK_APP": "backend/app.py",
|
||||||
"FLASK_ENV": "development",
|
"FLASK_ENV": "development",
|
||||||
"FLASK_DEBUG": "1"
|
"FLASK_DEBUG": "1"
|
||||||
},
|
},
|
||||||
@ -40,7 +76,7 @@
|
|||||||
"run",
|
"run",
|
||||||
"--no-debugger",
|
"--no-debugger",
|
||||||
"--no-reload",
|
"--no-reload",
|
||||||
"--host='0.0.0.0'"
|
"--host=0.0.0.0"
|
||||||
],
|
],
|
||||||
"jinja": true
|
"jinja": true
|
||||||
},
|
},
|
||||||
|
8
.vscode/settings.json
vendored
8
.vscode/settings.json
vendored
@ -1,3 +1,9 @@
|
|||||||
{
|
{
|
||||||
"python.pythonPath": "/usr/bin/python"
|
"python.pythonPath": "/usr/bin/python",
|
||||||
|
"files.exclude": {
|
||||||
|
"**/.classpath": true,
|
||||||
|
"**/.project": true,
|
||||||
|
"**/.settings": true,
|
||||||
|
"**/.factorypath": true
|
||||||
|
}
|
||||||
}
|
}
|
22
.vscode/tasks.json
vendored
Normal file
22
.vscode/tasks.json
vendored
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
// 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": "Start Frontend",
|
||||||
|
"type": "npm",
|
||||||
|
"script": "start",
|
||||||
|
"path": "frontend/ng-karaoqueue/",
|
||||||
|
"problemMatcher": [
|
||||||
|
"$tsc"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
13
KaraokeWarkeliste.code-workspace
Normal file
13
KaraokeWarkeliste.code-workspace
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"folders": [
|
||||||
|
{
|
||||||
|
"path": "./frontend/ng-karaoqueue"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "backend"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"path": "docs"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
1
backend/Procfile
Normal file
1
backend/Procfile
Normal file
@ -0,0 +1 @@
|
|||||||
|
web: gunicorn wsgi:app
|
@ -1,10 +1,11 @@
|
|||||||
from flask import Flask, render_template, Response, abort, request, redirect
|
from flask import Flask, render_template, Response, abort, request, redirect, send_from_directory
|
||||||
import helpers
|
import helpers
|
||||||
import database
|
import database
|
||||||
import data_adapters
|
import data_adapters
|
||||||
import os, errno
|
import os
|
||||||
import json
|
import json
|
||||||
from flask_basicauth import BasicAuth
|
from flask_basicauth import BasicAuth
|
||||||
|
from helpers import nocache
|
||||||
app = Flask(__name__, static_url_path='/static')
|
app = Flask(__name__, static_url_path='/static')
|
||||||
|
|
||||||
basic_auth = BasicAuth(app)
|
basic_auth = BasicAuth(app)
|
||||||
@ -17,16 +18,47 @@ def home():
|
|||||||
else:
|
else:
|
||||||
return render_template('main.html', list=database.get_list(), auth=basic_auth.authenticate())
|
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'])
|
@app.route('/api/enqueue', methods=['POST'])
|
||||||
|
@nocache
|
||||||
def enqueue():
|
def enqueue():
|
||||||
if accept_entries:
|
|
||||||
if not request.json:
|
if not request.json:
|
||||||
print(request.data)
|
print(request.data)
|
||||||
abort(400)
|
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']
|
name = request.json['name']
|
||||||
song_id = request.json['id']
|
song_id = request.json['id']
|
||||||
database.add_entry(name, song_id)
|
if request.authorization:
|
||||||
|
database.add_entry(name, song_id, client_id)
|
||||||
return Response('{"status":"OK"}', mimetype='text/json')
|
return Response('{"status":"OK"}', mimetype='text/json')
|
||||||
|
else:
|
||||||
|
if accept_entries:
|
||||||
|
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() < app.config['MAX_QUEUE']:
|
||||||
|
if database.check_entry_quota(client_id) < 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:
|
else:
|
||||||
return Response('{"status":"Currently not accepting entries"}', mimetype='text/json', status=423)
|
return Response('{"status":"Currently not accepting entries"}', mimetype='text/json', status=423)
|
||||||
|
|
||||||
@ -35,31 +67,66 @@ def enqueue():
|
|||||||
def songlist():
|
def songlist():
|
||||||
return render_template('songlist.html', list=database.get_song_list(), auth=basic_auth.authenticate())
|
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())
|
||||||
|
|
||||||
|
|
||||||
|
@app.route("/settings", methods=['POST'])
|
||||||
|
@nocache
|
||||||
|
@basic_auth.required
|
||||||
|
def settings_post():
|
||||||
|
entryquota = request.form.get("entryquota")
|
||||||
|
maxqueue = request.form.get("maxqueue")
|
||||||
|
if entryquota.isnumeric() and int(entryquota) > 0:
|
||||||
|
app.config['ENTRY_QUOTA'] = int(entryquota)
|
||||||
|
else:
|
||||||
|
abort(400)
|
||||||
|
if maxqueue.isnumeric and int(maxqueue) > 0:
|
||||||
|
app.config['MAX_QUEUE'] = int(maxqueue)
|
||||||
|
else:
|
||||||
|
abort(400)
|
||||||
|
|
||||||
|
return render_template('settings.html', app=app, auth=basic_auth.authenticate())
|
||||||
|
|
||||||
|
|
||||||
@app.route("/api/queue")
|
@app.route("/api/queue")
|
||||||
|
@nocache
|
||||||
def queue_json():
|
def queue_json():
|
||||||
list = data_adapters.dict_from_rows(database.get_list())
|
list = data_adapters.dict_from_rows(database.get_list())
|
||||||
return Response(json.dumps(list, ensure_ascii=False).encode('utf-8'), mimetype='text/json')
|
return Response(json.dumps(list, ensure_ascii=False).encode('utf-8'), mimetype='text/json')
|
||||||
|
|
||||||
|
|
||||||
@app.route("/plays")
|
@app.route("/plays")
|
||||||
|
@nocache
|
||||||
@basic_auth.required
|
@basic_auth.required
|
||||||
def played_list():
|
def played_list():
|
||||||
return render_template('played_list.html', list=database.get_played_list(), auth=basic_auth.authenticate())
|
return render_template('played_list.html', list=database.get_played_list(), auth=basic_auth.authenticate())
|
||||||
|
|
||||||
|
|
||||||
@app.route("/api/songs")
|
@app.route("/api/songs")
|
||||||
|
@nocache
|
||||||
def songs():
|
def songs():
|
||||||
list = database.get_song_list()
|
list = database.get_song_list()
|
||||||
return Response(json.dumps(list, ensure_ascii=False).encode('utf-8'), mimetype='text/json')
|
return Response(json.dumps(list, ensure_ascii=False).encode('utf-8'), mimetype='text/json')
|
||||||
|
|
||||||
|
|
||||||
@app.route("/api/songs/update")
|
@app.route("/api/songs/update")
|
||||||
|
@nocache
|
||||||
@basic_auth.required
|
@basic_auth.required
|
||||||
def update_songs():
|
def update_songs():
|
||||||
database.delete_all_entries()
|
database.delete_all_entries()
|
||||||
status = database.import_songs(helpers.get_songs(helpers.get_catalog_url()))
|
status = database.import_songs(
|
||||||
|
helpers.get_songs(helpers.get_catalog_url()))
|
||||||
print(status)
|
print(status)
|
||||||
return Response('{"status": "%s" }' % status, mimetype='text/json')
|
return Response('{"status": "%s" }' % status, mimetype='text/json')
|
||||||
|
|
||||||
|
|
||||||
@app.route("/api/songs/compl")
|
@app.route("/api/songs/compl")
|
||||||
|
@nocache
|
||||||
def get_song_completions(input_string=""):
|
def get_song_completions(input_string=""):
|
||||||
input_string = request.args.get('search', input_string)
|
input_string = request.args.get('search', input_string)
|
||||||
if input_string != "":
|
if input_string != "":
|
||||||
@ -72,6 +139,7 @@ def get_song_completions(input_string=""):
|
|||||||
|
|
||||||
|
|
||||||
@app.route("/api/entries/delete/<entry_id>")
|
@app.route("/api/entries/delete/<entry_id>")
|
||||||
|
@nocache
|
||||||
@basic_auth.required
|
@basic_auth.required
|
||||||
def delete_entry(entry_id):
|
def delete_entry(entry_id):
|
||||||
if database.delete_entry(entry_id):
|
if database.delete_entry(entry_id):
|
||||||
@ -81,6 +149,7 @@ def delete_entry(entry_id):
|
|||||||
|
|
||||||
|
|
||||||
@app.route("/api/entries/delete", methods=['POST'])
|
@app.route("/api/entries/delete", methods=['POST'])
|
||||||
|
@nocache
|
||||||
@basic_auth.required
|
@basic_auth.required
|
||||||
def delete_entries():
|
def delete_entries():
|
||||||
if not request.json:
|
if not request.json:
|
||||||
@ -95,6 +164,7 @@ def delete_entries():
|
|||||||
|
|
||||||
|
|
||||||
@app.route("/api/entries/mark_sung/<entry_id>")
|
@app.route("/api/entries/mark_sung/<entry_id>")
|
||||||
|
@nocache
|
||||||
@basic_auth.required
|
@basic_auth.required
|
||||||
def mark_sung(entry_id):
|
def mark_sung(entry_id):
|
||||||
if database.add_sung_song(entry_id):
|
if database.add_sung_song(entry_id):
|
||||||
@ -102,7 +172,18 @@ def mark_sung(entry_id):
|
|||||||
else:
|
else:
|
||||||
return Response('{"status": "FAIL"}', mimetype='text/json')
|
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>")
|
@app.route("/api/entries/accept/<value>")
|
||||||
|
@nocache
|
||||||
@basic_auth.required
|
@basic_auth.required
|
||||||
def set_accept_entries(value):
|
def set_accept_entries(value):
|
||||||
global accept_entries
|
global accept_entries
|
||||||
@ -114,12 +195,14 @@ def set_accept_entries(value):
|
|||||||
|
|
||||||
|
|
||||||
@app.route("/api/entries/accept")
|
@app.route("/api/entries/accept")
|
||||||
|
@nocache
|
||||||
def get_accept_entries():
|
def get_accept_entries():
|
||||||
global accept_entries
|
global accept_entries
|
||||||
return Response('{"status": "OK", "value": '+str(int(accept_entries))+'}', mimetype='text/json')
|
return Response('{"status": "OK", "value": '+str(int(accept_entries))+'}', mimetype='text/json')
|
||||||
|
|
||||||
|
|
||||||
@app.route("/api/played/clear")
|
@app.route("/api/played/clear")
|
||||||
|
@nocache
|
||||||
@basic_auth.required
|
@basic_auth.required
|
||||||
def clear_played_songs():
|
def clear_played_songs():
|
||||||
if database.clear_played_songs():
|
if database.clear_played_songs():
|
||||||
@ -127,7 +210,9 @@ def clear_played_songs():
|
|||||||
else:
|
else:
|
||||||
return Response('{"status": "FAIL"}', mimetype='text/json')
|
return Response('{"status": "FAIL"}', mimetype='text/json')
|
||||||
|
|
||||||
|
|
||||||
@app.route("/api/entries/delete_all")
|
@app.route("/api/entries/delete_all")
|
||||||
|
@nocache
|
||||||
@basic_auth.required
|
@basic_auth.required
|
||||||
def delete_all_entries():
|
def delete_all_entries():
|
||||||
if database.delete_all_entries():
|
if database.delete_all_entries():
|
||||||
@ -135,13 +220,16 @@ def delete_all_entries():
|
|||||||
else:
|
else:
|
||||||
return Response('{"status": "FAIL"}', mimetype='text/json')
|
return Response('{"status": "FAIL"}', mimetype='text/json')
|
||||||
|
|
||||||
|
|
||||||
@app.route("/login")
|
@app.route("/login")
|
||||||
@basic_auth.required
|
@basic_auth.required
|
||||||
def admin():
|
def admin():
|
||||||
return redirect("/", code=303)
|
return redirect("/", code=303)
|
||||||
|
|
||||||
|
|
||||||
@app.before_first_request
|
@app.before_first_request
|
||||||
def activate_job():
|
def activate_job():
|
||||||
|
helpers.load_version(app)
|
||||||
helpers.create_data_directory()
|
helpers.create_data_directory()
|
||||||
database.create_entry_table()
|
database.create_entry_table()
|
||||||
database.create_song_table()
|
database.create_song_table()
|
||||||
@ -151,5 +239,21 @@ def activate_job():
|
|||||||
helpers.setup_config(app)
|
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'
|
||||||
|
return response
|
||||||
|
|
||||||
|
@app.context_processor
|
||||||
|
def inject_version():
|
||||||
|
return dict(karaoqueue_version=app.config['VERSION'])
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
app.run(host='127.0.0.1', port=8080, debug=True)
|
app.run(host='127.0.0.1', port=8080, debug=True)
|
@ -1,5 +1,9 @@
|
|||||||
runtime: python39
|
runtime: python39
|
||||||
|
|
||||||
|
manual_scaling:
|
||||||
|
# Das ist alles bloß dumm schnell zusammengehackt...
|
||||||
|
instances: 1
|
||||||
|
|
||||||
handlers:
|
handlers:
|
||||||
# This configures Google App Engine to serve the files in the app's static
|
# This configures Google App Engine to serve the files in the app's static
|
||||||
# directory.
|
# directory.
|
@ -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']
|
|
@ -9,11 +9,13 @@ entry_table = "entries"
|
|||||||
index_label = "Id"
|
index_label = "Id"
|
||||||
done_table = "done_songs"
|
done_table = "done_songs"
|
||||||
|
|
||||||
|
|
||||||
def open_db():
|
def open_db():
|
||||||
conn = sqlite3.connect("/tmp/karaoqueue.db")
|
conn = sqlite3.connect("/tmp/karaoqueue.db")
|
||||||
conn.execute('PRAGMA encoding = "UTF-8";')
|
conn.execute('PRAGMA encoding = "UTF-8";')
|
||||||
return conn
|
return conn
|
||||||
|
|
||||||
|
|
||||||
def import_songs(song_csv):
|
def import_songs(song_csv):
|
||||||
print("Start importing Songs...")
|
print("Start importing Songs...")
|
||||||
df = pandas.read_csv(StringIO(song_csv), sep=';')
|
df = pandas.read_csv(StringIO(song_csv), sep=';')
|
||||||
@ -27,10 +29,11 @@ def import_songs(song_csv):
|
|||||||
print("Imported songs ({} in Database)".format(num_songs))
|
print("Imported songs ({} in Database)".format(num_songs))
|
||||||
return("Imported songs ({} in Database)".format(num_songs))
|
return("Imported songs ({} in Database)".format(num_songs))
|
||||||
|
|
||||||
|
|
||||||
def create_entry_table():
|
def create_entry_table():
|
||||||
conn = open_db()
|
conn = open_db()
|
||||||
conn.execute('CREATE TABLE IF NOT EXISTS '+entry_table +
|
conn.execute('CREATE TABLE IF NOT EXISTS '+entry_table +
|
||||||
' (ID INTEGER PRIMARY KEY NOT NULL, Song_Id INTEGER NOT NULL, Name VARCHAR(255))')
|
' (ID INTEGER PRIMARY KEY NOT NULL, Song_Id INTEGER NOT NULL, Name VARCHAR(255), Client_Id VARCHAR(36), Transferred INTEGER DEFAULT 0)')
|
||||||
conn.close()
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
@ -40,6 +43,7 @@ def create_done_song_table():
|
|||||||
' (Song_Id INTEGER PRIMARY KEY NOT NULL, Plays INTEGER)')
|
' (Song_Id INTEGER PRIMARY KEY NOT NULL, Plays INTEGER)')
|
||||||
conn.close()
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
def create_song_table():
|
def create_song_table():
|
||||||
conn = open_db()
|
conn = open_db()
|
||||||
conn.execute("CREATE TABLE IF NOT EXISTS \""+song_table+"""\" (
|
conn.execute("CREATE TABLE IF NOT EXISTS \""+song_table+"""\" (
|
||||||
@ -55,10 +59,11 @@ def create_song_table():
|
|||||||
)""")
|
)""")
|
||||||
conn.close()
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
def create_list_view():
|
def create_list_view():
|
||||||
conn = open_db()
|
conn = open_db()
|
||||||
conn.execute("""CREATE VIEW IF NOT EXISTS [Liste] AS
|
conn.execute("""CREATE VIEW IF NOT EXISTS [Liste] AS
|
||||||
SELECT Name, Title, Artist, entries.Id, songs.Id
|
SELECT Name, Title, Artist, entries.Id, songs.Id, entries.Transferred
|
||||||
FROM entries, songs
|
FROM entries, songs
|
||||||
WHERE entries.Song_Id=songs.Id""")
|
WHERE entries.Song_Id=songs.Id""")
|
||||||
conn.close()
|
conn.close()
|
||||||
@ -72,6 +77,7 @@ def create_done_song_view():
|
|||||||
WHERE done_songs.Song_Id=songs.Id""")
|
WHERE done_songs.Song_Id=songs.Id""")
|
||||||
conn.close()
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
def get_list():
|
def get_list():
|
||||||
conn = open_db()
|
conn = open_db()
|
||||||
conn.row_factory = sqlite3.Row
|
conn.row_factory = sqlite3.Row
|
||||||
@ -86,31 +92,36 @@ def get_played_list():
|
|||||||
cur.execute("SELECT * FROM Abspielliste")
|
cur.execute("SELECT * FROM Abspielliste")
|
||||||
return cur.fetchall()
|
return cur.fetchall()
|
||||||
|
|
||||||
|
|
||||||
def get_song_list():
|
def get_song_list():
|
||||||
conn = open_db()
|
conn = open_db()
|
||||||
cur = conn.cursor()
|
cur = conn.cursor()
|
||||||
cur.execute("SELECT Artist || \" - \" || Title AS Song, Id FROM songs;")
|
cur.execute("SELECT Artist || \" - \" || Title AS Song, Id FROM songs;")
|
||||||
return cur.fetchall()
|
return cur.fetchall()
|
||||||
|
|
||||||
|
|
||||||
def get_song_completions(input_string):
|
def get_song_completions(input_string):
|
||||||
conn = open_db()
|
conn = open_db()
|
||||||
cur = conn.cursor()
|
cur = conn.cursor()
|
||||||
# Don't look, it burns...
|
# Don't look, it burns...
|
||||||
prepared_string = "%{0}%".format(input_string).upper() # "Test" -> "%TEST%"
|
prepared_string = "%{0}%".format(
|
||||||
|
input_string).upper() # "Test" -> "%TEST%"
|
||||||
print(prepared_string)
|
print(prepared_string)
|
||||||
cur.execute(
|
cur.execute(
|
||||||
"SELECT Title || \" - \" || Artist AS Song, Id FROM songs WHERE REPLACE(REPLACE(REPLACE(REPLACE(UPPER( SONG ),'ö','Ö'),'ü','Ü'),'ä','Ä'),'ß','ẞ') LIKE (?) LIMIT 20;", (prepared_string,))
|
"SELECT Title || \" - \" || Artist AS Song, Id FROM songs WHERE REPLACE(REPLACE(REPLACE(REPLACE(UPPER( SONG ),'ö','Ö'),'ü','Ü'),'ä','Ä'),'ß','ẞ') LIKE (?) LIMIT 20;", (prepared_string,))
|
||||||
return cur.fetchall()
|
return cur.fetchall()
|
||||||
|
|
||||||
def add_entry(name,song_id):
|
|
||||||
|
def add_entry(name, song_id, client_id):
|
||||||
conn = open_db()
|
conn = open_db()
|
||||||
cur = conn.cursor()
|
cur = conn.cursor()
|
||||||
cur.execute(
|
cur.execute(
|
||||||
"INSERT INTO entries (Song_Id,Name) VALUES(?,?);", (song_id,name))
|
"INSERT INTO entries (Song_Id,Name,Client_Id) VALUES(?,?,?);", (song_id, name, client_id))
|
||||||
conn.commit()
|
conn.commit()
|
||||||
conn.close()
|
conn.close()
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
def add_sung_song(entry_id):
|
def add_sung_song(entry_id):
|
||||||
conn = open_db()
|
conn = open_db()
|
||||||
cur = conn.cursor()
|
cur = conn.cursor()
|
||||||
@ -127,6 +138,38 @@ def add_sung_song(entry_id):
|
|||||||
conn.close()
|
conn.close()
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def toggle_transferred(entry_id):
|
||||||
|
conn = open_db()
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute("SELECT Transferred FROM entries WHERE ID =?", (entry_id,))
|
||||||
|
marked = cur.fetchall()[0][0]
|
||||||
|
if(marked == 0):
|
||||||
|
cur.execute(
|
||||||
|
"UPDATE entries SET Transferred = 1 WHERE ID =?", (entry_id,))
|
||||||
|
else:
|
||||||
|
cur.execute(
|
||||||
|
"UPDATE entries SET Transferred = 0 WHERE ID =?", (entry_id,))
|
||||||
|
conn.commit()
|
||||||
|
conn.close()
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def check_entry_quota(client_id):
|
||||||
|
conn = open_db()
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"SELECT Count(*) FROM entries WHERE entries.Client_Id = ?", (client_id,))
|
||||||
|
return cur.fetchall()[0][0]
|
||||||
|
|
||||||
|
|
||||||
|
def check_queue_length():
|
||||||
|
conn = open_db()
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute("SELECT Count(*) FROM entries")
|
||||||
|
return cur.fetchall()[0][0]
|
||||||
|
|
||||||
|
|
||||||
def clear_played_songs():
|
def clear_played_songs():
|
||||||
conn = open_db()
|
conn = open_db()
|
||||||
cur = conn.cursor()
|
cur = conn.cursor()
|
||||||
@ -135,6 +178,7 @@ def clear_played_songs():
|
|||||||
conn.close()
|
conn.close()
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
def delete_entry(id):
|
def delete_entry(id):
|
||||||
conn = open_db()
|
conn = open_db()
|
||||||
cur = conn.cursor()
|
cur = conn.cursor()
|
||||||
@ -158,6 +202,7 @@ def delete_entries(ids):
|
|||||||
except sqlite3.Error as error:
|
except sqlite3.Error as error:
|
||||||
return -1
|
return -1
|
||||||
|
|
||||||
|
|
||||||
def delete_all_entries():
|
def delete_all_entries():
|
||||||
conn = open_db()
|
conn = open_db()
|
||||||
cur = conn.cursor()
|
cur = conn.cursor()
|
@ -8,4 +8,4 @@ RUN pip install Flask-BasicAuth
|
|||||||
|
|
||||||
RUN pip install bs4
|
RUN pip install bs4
|
||||||
|
|
||||||
COPY ./app /app
|
COPY ../app /app
|
79
backend/helpers.py
Normal file
79
backend/helpers.py
Normal file
@ -0,0 +1,79 @@
|
|||||||
|
import requests
|
||||||
|
from bs4 import BeautifulSoup
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import uuid
|
||||||
|
from flask import make_response
|
||||||
|
from functools import wraps, update_wrapper
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
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 os.path.isfile(config_file)
|
||||||
|
|
||||||
|
def load_version(app):
|
||||||
|
if os.environ.get("SOURCE_VERSION"):
|
||||||
|
app.config['VERSION'] = os.environ.get("SOURCE_VERSION")[0:7]
|
||||||
|
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 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', 'entryquota': 3, 'maxqueue': 20}
|
||||||
|
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']
|
||||||
|
app.config['ENTRY_QUOTA'] = config['entryquota']
|
||||||
|
app.config['MAX_QUEUE'] = config['maxqueue']
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def nocache(view):
|
||||||
|
@wraps(view)
|
||||||
|
def no_cache(*args, **kwargs):
|
||||||
|
response = make_response(view(*args, **kwargs))
|
||||||
|
response.headers['Last-Modified'] = datetime.now()
|
||||||
|
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)
|
@ -2,3 +2,4 @@ requests
|
|||||||
pandas
|
pandas
|
||||||
Flask-BasicAuth
|
Flask-BasicAuth
|
||||||
bs4
|
bs4
|
||||||
|
gunicorn
|
BIN
backend/static/favicon.ico
Normal file
BIN
backend/static/favicon.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 318 B |
BIN
backend/static/images/touch/homescreen512.png
Normal file
BIN
backend/static/images/touch/homescreen512.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 11 KiB |
@ -2,12 +2,13 @@
|
|||||||
"name": "KaraoQueue",
|
"name": "KaraoQueue",
|
||||||
"short_name": "KaraoQueue",
|
"short_name": "KaraoQueue",
|
||||||
"start_url": "/",
|
"start_url": "/",
|
||||||
|
"url": "https://karaoqueue-323511.appspot.com/",
|
||||||
"display": "standalone",
|
"display": "standalone",
|
||||||
"background_color": "#343a40",
|
"background_color": "#343a40",
|
||||||
"description": "Eine Karaokewarteliste.",
|
"description": "Eine Karaokewarteliste.",
|
||||||
"icons": [{
|
"icons": [{
|
||||||
"src": "images/touch/homescreen192.png",
|
"src": "images/touch/homescreen512.png",
|
||||||
"sizes": "192x192",
|
"sizes": "512x512",
|
||||||
"type": "image/png"
|
"type": "image/png"
|
||||||
}],
|
}],
|
||||||
"related_applications": [{
|
"related_applications": [{
|
@ -51,6 +51,9 @@
|
|||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link" href="/plays">Abspielliste</a>
|
<a class="nav-link" href="/plays">Abspielliste</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" href="/settings">Einstellungen</a>
|
||||||
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
<!--<form class="form-inline my-2 my-lg-0">
|
<!--<form class="form-inline my-2 my-lg-0">
|
||||||
@ -68,12 +71,11 @@
|
|||||||
<footer class="footer">
|
<footer class="footer">
|
||||||
<div class="container text-center py-3">
|
<div class="container text-center py-3">
|
||||||
{% if not auth %}
|
{% if not auth %}
|
||||||
<a href="/login" class="ml-1 mr-1"><i
|
<a href="/login" class="ml-1 mr-1"><i class="fas fa-sign-in-alt mr-1"></i><span>Login</span></a>
|
||||||
class="fas fa-sign-in-alt mr-1"></i><span>Login</span></a>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<!--<a href="https://github.com/PhoenixTwoFive/karaoqueue"
|
<!--<a href="https://github.com/PhoenixTwoFive/karaoqueue"
|
||||||
class="ml-1 mr-1"><i class="fab fa-github mr-1"></i><span>Github</span></a>-->
|
class="ml-1 mr-1"><i class="fab fa-github mr-1"></i><span>Github</span></a>-->
|
||||||
<span class="text-muted">KaraoQueue (stale branch) - <span>©</span> 2019-2021 - Phillip
|
<span class="text-muted">KaraoQueue {{karaoqueue_version}} - <span>©</span> 2019-21 - Phillip
|
||||||
Kühne</span>
|
Kühne</span>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
@ -95,16 +97,34 @@
|
|||||||
integrity="sha256-4F7e4JsAJyLUdpP7Q8Sah866jCOhv72zU5E8lIRER4w=" crossorigin="anonymous">
|
integrity="sha256-4F7e4JsAJyLUdpP7Q8Sah866jCOhv72zU5E8lIRER4w=" crossorigin="anonymous">
|
||||||
</script>
|
</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/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
|
||||||
|
src="https://unpkg.com/bootstrap-table@1.15.3/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://gitcdn.github.io/bootstrap-toggle/2.2.2/js/bootstrap-toggle.min.js"></script>
|
||||||
{% block extrajs %}{% endblock %}
|
{% block extrajs %}{% endblock %}
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
|
loadOrGenerateClientId()
|
||||||
// get current URL path and assign 'active' class
|
// get current URL path and assign 'active' class
|
||||||
var pathname = window.location.pathname;
|
var pathname = window.location.pathname;
|
||||||
$('.navbar-nav > li > a[href="' + pathname + '"]').parent().addClass('active');
|
$('.navbar-nav > li > a[href="' + pathname + '"]').parent().addClass('active');
|
||||||
$('[data-toggle="tooltip"]').tooltip()
|
$('[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>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|
@ -116,10 +116,10 @@ table td:nth-child(2) {
|
|||||||
$.getJSON("/api/entries/accept", (data) => {
|
$.getJSON("/api/entries/accept", (data) => {
|
||||||
if (data["value"]!=$('#entryToggle').is(":checked")) {
|
if (data["value"]!=$('#entryToggle').is(":checked")) {
|
||||||
if(data["value"]==1) {
|
if(data["value"]==1) {
|
||||||
$('#entryToggle').bootstrapToggle('on')
|
$('#entryToggle').data('bs.toggle').on('true')
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$('#entryToggle').bootstrapToggle('off')
|
$('#entryToggle').data('bs.toggle').off('true')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -146,6 +146,19 @@ table td:nth-child(2) {
|
|||||||
$("#entrytable").bootstrapTable('refresh')
|
$("#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) {
|
function DeleteSelectedEntries(ids) {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -182,7 +195,13 @@ table td:nth-child(2) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
function TableActions (value, row, index) {
|
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> <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>";
|
let outerHTML = ""
|
||||||
|
if (row.Transferred==1) {
|
||||||
|
outerHTML = "<button type=\"button\" class=\"btn btn-default\" onclick=\"markEntryAsTransferred("+row.ID+")\"><i class=\"fas fa-backward\"></i></button> <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> <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>";
|
||||||
|
} else {
|
||||||
|
outerHTML = "<button type=\"button\" class=\"btn btn-info\" onclick=\"markEntryAsTransferred("+row.ID+")\"><i class=\"fas fa-exchange-alt\"></i></button> <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> <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>";
|
||||||
|
}
|
||||||
|
return outerHTML;
|
||||||
}
|
}
|
||||||
function getIdSelections() {
|
function getIdSelections() {
|
||||||
return $.map($("#entrytable").bootstrapTable('getSelections'), function (row) {
|
return $.map($("#entrytable").bootstrapTable('getSelections'), function (row) {
|
18
backend/templates/settings.html
Normal file
18
backend/templates/settings.html
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{% 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>
|
||||||
|
<input type="submit" class="btn btn-primary mr-1 mb-2" value="Einstellungen anwenden">
|
||||||
|
<input type="button" class="btn btn-default mr-1 mb-2" onclick="$.get('/writeSettings').done(()=>{alert('Einstellungen gespeichert')}).fail(()=>{alert('Fehler beim Speichern der Einstellungen')})" value="Einstellungen speichern"/>
|
||||||
|
</form>
|
||||||
|
{% endblock %}
|
||||||
|
{% block extrajs %}
|
||||||
|
{% endblock %}
|
@ -70,10 +70,11 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
function enqueue(id,name,success_callback, blocked_callback) {
|
function enqueue(client_id, id, name, success_callback, blocked_callback) {
|
||||||
var data = {
|
var data = {
|
||||||
"name": name,
|
"name": name,
|
||||||
"id": id
|
"id": id,
|
||||||
|
"client_id": client_id
|
||||||
}
|
}
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'POST',
|
type: 'POST',
|
||||||
@ -95,14 +96,14 @@
|
|||||||
function submitModal() {
|
function submitModal() {
|
||||||
var name = $("#singerNameInput").val();
|
var name = $("#singerNameInput").val();
|
||||||
var id = $("#selectedId").attr("value");
|
var id = $("#selectedId").attr("value");
|
||||||
enqueue(id,name,function () {
|
enqueue(localStorage.getItem("clientId"),id, name, function () {
|
||||||
$("#enqueueModal").modal('hide');
|
$("#enqueueModal").modal('hide');
|
||||||
window.location.href = '/#end';
|
window.location.href = '/#end';
|
||||||
}, function () {
|
}, function (response) {
|
||||||
bootbox.alert({
|
bootbox.alert({
|
||||||
message: "Es werden leider keine neuen Anmeldungen mehr angenommen. Tut mir leid :(",
|
message: "Deine Eintragung konnte leider nicht vorgenommen werden.\nGrund: "+response.responseJSON.status,
|
||||||
});
|
});
|
||||||
$(".enqueueButton").prop("disabled",true);
|
entriesAccepted();
|
||||||
$("#enqueueModal").modal('hide');
|
$("#enqueueModal").modal('hide');
|
||||||
|
|
||||||
});
|
});
|
||||||
@ -110,6 +111,7 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{% if not auth %}
|
||||||
function entriesAccepted() {
|
function entriesAccepted() {
|
||||||
$.getJSON("/api/entries/accept", (data, out) => {
|
$.getJSON("/api/entries/accept", (data, out) => {
|
||||||
if (data["value"] == 0) {
|
if (data["value"] == 0) {
|
||||||
@ -124,6 +126,11 @@
|
|||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
{% else %}
|
||||||
|
function entriesAccepted() {
|
||||||
|
$(".enqueueButton").prop("disabled", false)
|
||||||
|
}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
4
backend/wsgi.py
Normal file
4
backend/wsgi.py
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
from app import app
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
app.run()
|
392
docs/swagger.yaml
Normal file
392
docs/swagger.yaml
Normal file
@ -0,0 +1,392 @@
|
|||||||
|
openapi: 3.0.2
|
||||||
|
info:
|
||||||
|
title: Karaoqueue API
|
||||||
|
version: '0.0.1'
|
||||||
|
servers:
|
||||||
|
- url: 'http://localhost:3000/api'
|
||||||
|
description: Local Test sever instance
|
||||||
|
- url: 'https://karaoke.phillipathome.dynv6.net/api'
|
||||||
|
description: Production API
|
||||||
|
|
||||||
|
paths:
|
||||||
|
/queue:
|
||||||
|
get:
|
||||||
|
summary: 'Fetch entry Queue content'
|
||||||
|
description: 'Fetch entry Queue'
|
||||||
|
parameters:
|
||||||
|
- name: index
|
||||||
|
in: query
|
||||||
|
description: Position from which on to return results
|
||||||
|
required: false
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
- name: limit
|
||||||
|
in: query
|
||||||
|
description: How many items to return at one time (max 100, default 20)
|
||||||
|
required: false
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: '#/components/schemas/QueueEntry'
|
||||||
|
'400':
|
||||||
|
description: Invalid request. Check your parameters.
|
||||||
|
'404':
|
||||||
|
description: No Entries found in specified range.
|
||||||
|
'5XX':
|
||||||
|
description: Unexpected error.
|
||||||
|
post:
|
||||||
|
description: 'Add entry to Queue'
|
||||||
|
summary: 'Add entry to Queue'
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
singer_name:
|
||||||
|
type: string
|
||||||
|
song_id:
|
||||||
|
type: integer
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
entry_id:
|
||||||
|
type: string
|
||||||
|
format: bson.ObjectID
|
||||||
|
pattern: '/^[a-f\d]{24}$/i'
|
||||||
|
entry_auth:
|
||||||
|
type: string
|
||||||
|
'400':
|
||||||
|
description: Malformed request.
|
||||||
|
'405':
|
||||||
|
description: Currently not accepting entries.
|
||||||
|
delete:
|
||||||
|
summary: 'Clear queue'
|
||||||
|
security:
|
||||||
|
- cookieAuth: []
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK. Successfully cleared Queue
|
||||||
|
'401':
|
||||||
|
description: Not Authorized
|
||||||
|
|
||||||
|
description: clear queue
|
||||||
|
/queue/{entry_id}:
|
||||||
|
get:
|
||||||
|
summary: GET single queue entry
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: entry_id
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
required: true
|
||||||
|
description: ID of the Entry to get
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: '#/components/schemas/QueueEntry'
|
||||||
|
patch:
|
||||||
|
summary: Change entry
|
||||||
|
security:
|
||||||
|
- cookieAuth: []
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: entry_id
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
format: bson.ObjectID
|
||||||
|
pattern: '/^[a-f\d]{24}$/i'
|
||||||
|
required: true
|
||||||
|
description: >
|
||||||
|
ID of the entry to modify. One of the following is needed:
|
||||||
|
- Proper Bearer-Token authorization
|
||||||
|
- The entry_auth string corresponding to the entry
|
||||||
|
requestBody:
|
||||||
|
required: false
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- entry_auth
|
||||||
|
properties:
|
||||||
|
singer_name:
|
||||||
|
type: string
|
||||||
|
song_id:
|
||||||
|
type: integer
|
||||||
|
entry_auth:
|
||||||
|
type: string
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK
|
||||||
|
'404':
|
||||||
|
description: Entry not found
|
||||||
|
'405':
|
||||||
|
description: Method not allowed. Check your entry_auth or authorization.
|
||||||
|
delete:
|
||||||
|
summary: 'Delete entry'
|
||||||
|
security:
|
||||||
|
- cookieAuth: []
|
||||||
|
parameters:
|
||||||
|
- in: path
|
||||||
|
name: entry_id
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
format: bson.ObjectID
|
||||||
|
pattern: '/^[a-f\d]{24}$/i'
|
||||||
|
required: true
|
||||||
|
description: >
|
||||||
|
ID of the entry to modify. One of the following is needed:
|
||||||
|
- Proper Bearer-Token authorization
|
||||||
|
- The entry_auth string corresponding to the entry
|
||||||
|
requestBody:
|
||||||
|
required: false
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
required:
|
||||||
|
- entry_auth
|
||||||
|
properties:
|
||||||
|
entry_auth:
|
||||||
|
type: string
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK
|
||||||
|
'404':
|
||||||
|
description: Entry not found
|
||||||
|
'405':
|
||||||
|
description: Method not allowed. Check your entry_auth or authorization.
|
||||||
|
|
||||||
|
|
||||||
|
/songs:
|
||||||
|
get:
|
||||||
|
summary: Search in Songs
|
||||||
|
parameters:
|
||||||
|
- in: query
|
||||||
|
name: query
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
required: true
|
||||||
|
- name: limit
|
||||||
|
in: query
|
||||||
|
description: How many items to return at one time (max 100, default 20)
|
||||||
|
required: false
|
||||||
|
schema:
|
||||||
|
type: integer
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK. An array of Songs according to the Query string.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: '#/components/schemas/SongEntry'
|
||||||
|
'400':
|
||||||
|
description: Malformed Request
|
||||||
|
put:
|
||||||
|
summary: Update Song Database
|
||||||
|
description: >
|
||||||
|
Trigger an update of the database using the source CSV defined
|
||||||
|
in the config.
|
||||||
|
security:
|
||||||
|
- cookieAuth: []
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK. Songs have been updated
|
||||||
|
'401':
|
||||||
|
description: Authorization required. Check your auth.
|
||||||
|
/statistics:
|
||||||
|
get:
|
||||||
|
summary: Statistics about the Database
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: Statistics as JSON
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
num_songs:
|
||||||
|
type: integer
|
||||||
|
num_entries:
|
||||||
|
type: integer
|
||||||
|
|
||||||
|
/auth/login:
|
||||||
|
post:
|
||||||
|
summary: Logs in and returns the authentication cookie
|
||||||
|
requestBody:
|
||||||
|
required: true
|
||||||
|
description: A JSON object containing the login and password.
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: '#/components/schemas/LoginRequest'
|
||||||
|
security: [] # no authentication
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: >
|
||||||
|
Successfully authenticated.
|
||||||
|
The session ID is returned in a cookie named `jwt`. You need to include this cookie in subsequent requests.
|
||||||
|
headers:
|
||||||
|
Set-Cookie:
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
example: jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiJhZG1pbiIsImlhdCI6MTYwMTY1MDYwNSwiZXhwIjoxNjAxNjU0MjA1fQ.uGvOlBAZdbPT8U9s7jEt5PUWyxLrpgaf02EoPVC_Zlsd; Path=/; HttpOnly
|
||||||
|
/auth/logout:
|
||||||
|
get:
|
||||||
|
summary: Logs the user out and invalidates the session on the server
|
||||||
|
security:
|
||||||
|
- cookieAuth: []
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK.
|
||||||
|
'401':
|
||||||
|
description: Authorization required.
|
||||||
|
|
||||||
|
/rpc/end_event:
|
||||||
|
get:
|
||||||
|
summary: End the current event
|
||||||
|
description: Locks entries and does not allow reopening without reset
|
||||||
|
security:
|
||||||
|
- cookieAuth: []
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK.
|
||||||
|
|
||||||
|
/rpc/start_event:
|
||||||
|
get:
|
||||||
|
summary: Start new event. Clears entries and stats.
|
||||||
|
description: Sets up a clean state.
|
||||||
|
security:
|
||||||
|
- cookieAuth: []
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK.
|
||||||
|
|
||||||
|
/rpc/enable_registration:
|
||||||
|
get:
|
||||||
|
summary: Enables registration in the queue
|
||||||
|
description: Makes it possible for guests to register in the queue.
|
||||||
|
security:
|
||||||
|
- cookieAuth: []
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK.
|
||||||
|
|
||||||
|
|
||||||
|
/rpc/disable_registration:
|
||||||
|
get:
|
||||||
|
summary: Disables registration in the queue
|
||||||
|
description: Makes it impossible for guests to register in the queue.
|
||||||
|
security:
|
||||||
|
- cookieAuth: []
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK.
|
||||||
|
|
||||||
|
/rpc/get_playstats:
|
||||||
|
get:
|
||||||
|
summary: Get stats of played songs in the current event.
|
||||||
|
description: Returns the stats for the current evening as JSON
|
||||||
|
security:
|
||||||
|
- cookieAuth: []
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK.
|
||||||
|
|
||||||
|
/rpc/download_playstats:
|
||||||
|
get:
|
||||||
|
summary: Get stats of played songs in the current event for download.
|
||||||
|
description: Returns the stats for the current evening as PDF (for example for GEMA)
|
||||||
|
security:
|
||||||
|
- cookieAuth: []
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK.
|
||||||
|
|
||||||
|
/rpc/entry_fulfilled:
|
||||||
|
get:
|
||||||
|
summary: Mark an entry as fulfilled.
|
||||||
|
description: Mark an entry as fulfilled. This adds it to the statistics.
|
||||||
|
security:
|
||||||
|
- cookieAuth: []
|
||||||
|
responses:
|
||||||
|
'200':
|
||||||
|
description: OK.
|
||||||
|
parameters:
|
||||||
|
- in: query
|
||||||
|
name: entry_id
|
||||||
|
schema:
|
||||||
|
type: string
|
||||||
|
description: The id of the entry to mark as done.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
components:
|
||||||
|
securitySchemes:
|
||||||
|
cookieAuth: # arbitrary name for the security scheme; will be used in the "security" key later
|
||||||
|
type: apiKey
|
||||||
|
in: cookie
|
||||||
|
name: jwt # cookie name
|
||||||
|
schemas:
|
||||||
|
QueueEntry:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
_id:
|
||||||
|
type: string
|
||||||
|
format: bson.ObjectID
|
||||||
|
pattern: '/^[a-f\d]{24}$/i'
|
||||||
|
singer_name:
|
||||||
|
type: string
|
||||||
|
song_id:
|
||||||
|
type: integer
|
||||||
|
SongEntry:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
id:
|
||||||
|
type: integer
|
||||||
|
title:
|
||||||
|
type: string
|
||||||
|
artist:
|
||||||
|
type: string
|
||||||
|
year:
|
||||||
|
type: integer
|
||||||
|
duet:
|
||||||
|
type: boolean
|
||||||
|
explicit:
|
||||||
|
type: boolean
|
||||||
|
styles:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
languages:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
LoginRequest:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
username:
|
||||||
|
type: string
|
||||||
|
password:
|
||||||
|
type: string
|
||||||
|
format: password
|
||||||
|
|
25
frontend/ng-karaoqueue/.vscode/launch.json
vendored
Normal file
25
frontend/ng-karaoqueue/.vscode/launch.json
vendored
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
{
|
||||||
|
// Use IntelliSense to learn about possible attributes.
|
||||||
|
// Hover to view descriptions of existing attributes.
|
||||||
|
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||||
|
"version": "0.2.0",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"type": "firefox",
|
||||||
|
"request": "launch",
|
||||||
|
"reAttach": true,
|
||||||
|
"name": "Launch Firefox against localhost",
|
||||||
|
"url": "http://localhost:4200",
|
||||||
|
"webRoot": "${workspaceFolder}"
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"type": "chrome",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "Launch Chrome against localhost",
|
||||||
|
"url": "http://localhost:4200",
|
||||||
|
"webRoot": "${workspaceFolder}",
|
||||||
|
"runtimeExecutable": "/usr/bin/chromium"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
26
frontend/ng-karaoqueue/.vscode/tasks.json
vendored
Normal file
26
frontend/ng-karaoqueue/.vscode/tasks.json
vendored
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
// See https://go.microsoft.com/fwlink/?LinkId=733558
|
||||||
|
// for the documentation about the tasks.json format
|
||||||
|
"version": "2.0.0",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "start",
|
||||||
|
"group": "build",
|
||||||
|
"problemMatcher": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "build",
|
||||||
|
"group": "build",
|
||||||
|
"problemMatcher": []
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "serve",
|
||||||
|
"problemMatcher": [
|
||||||
|
"$tsc"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
135
frontend/ng-karaoqueue/angular.json
Normal file
135
frontend/ng-karaoqueue/angular.json
Normal file
@ -0,0 +1,135 @@
|
|||||||
|
{
|
||||||
|
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
||||||
|
"version": 1,
|
||||||
|
"newProjectRoot": "projects",
|
||||||
|
"projects": {
|
||||||
|
"ng-karaoqueue": {
|
||||||
|
"projectType": "application",
|
||||||
|
"schematics": {},
|
||||||
|
"root": "",
|
||||||
|
"sourceRoot": "src",
|
||||||
|
"prefix": "app",
|
||||||
|
"architect": {
|
||||||
|
"build": {
|
||||||
|
"builder": "@angular-devkit/build-angular:browser",
|
||||||
|
"options": {
|
||||||
|
"outputPath": "dist/ng-karaoqueue",
|
||||||
|
"index": "src/index.html",
|
||||||
|
"main": "src/main.ts",
|
||||||
|
"polyfills": "src/polyfills.ts",
|
||||||
|
"tsConfig": "tsconfig.app.json",
|
||||||
|
"aot": false,
|
||||||
|
"assets": [
|
||||||
|
"src/favicon.ico",
|
||||||
|
"src/assets",
|
||||||
|
{
|
||||||
|
"glob": "mdi.svg",
|
||||||
|
"input": "node_modules/@mdi/angular-material/",
|
||||||
|
"output": "/assets/"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"styles": [
|
||||||
|
"src/custom-theme.scss",
|
||||||
|
"src/styles.scss"
|
||||||
|
],
|
||||||
|
"scripts": [],
|
||||||
|
"vendorChunk": true,
|
||||||
|
"extractLicenses": false,
|
||||||
|
"buildOptimizer": false,
|
||||||
|
"sourceMap": true,
|
||||||
|
"optimization": false,
|
||||||
|
"namedChunks": true
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"fileReplacements": [
|
||||||
|
{
|
||||||
|
"replace": "src/environments/environment.ts",
|
||||||
|
"with": "src/environments/environment.prod.ts"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"optimization": true,
|
||||||
|
"outputHashing": "all",
|
||||||
|
"sourceMap": false,
|
||||||
|
"namedChunks": false,
|
||||||
|
"aot": true,
|
||||||
|
"extractLicenses": true,
|
||||||
|
"vendorChunk": false,
|
||||||
|
"buildOptimizer": true,
|
||||||
|
"budgets": [
|
||||||
|
{
|
||||||
|
"type": "initial",
|
||||||
|
"maximumWarning": "2mb",
|
||||||
|
"maximumError": "5mb"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "anyComponentStyle",
|
||||||
|
"maximumWarning": "6kb",
|
||||||
|
"maximumError": "10kb"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"defaultConfiguration": ""
|
||||||
|
},
|
||||||
|
"serve": {
|
||||||
|
"builder": "@angular-devkit/build-angular:dev-server",
|
||||||
|
"options": {
|
||||||
|
"browserTarget": "ng-karaoqueue:build"
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"browserTarget": "ng-karaoqueue:build:production"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"extract-i18n": {
|
||||||
|
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||||
|
"options": {
|
||||||
|
"browserTarget": "ng-karaoqueue:build"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"test": {
|
||||||
|
"builder": "@angular-devkit/build-angular:karma",
|
||||||
|
"options": {
|
||||||
|
"main": "src/test.ts",
|
||||||
|
"polyfills": "src/polyfills.ts",
|
||||||
|
"tsConfig": "tsconfig.spec.json",
|
||||||
|
"karmaConfig": "karma.conf.js",
|
||||||
|
"assets": [
|
||||||
|
"src/favicon.ico",
|
||||||
|
"src/assets",
|
||||||
|
{
|
||||||
|
"glob": "mdi.svg",
|
||||||
|
"input": "node_modules/@mdi/angular-material/",
|
||||||
|
"output": "/assets/"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"styles": [
|
||||||
|
"./app/custom-theme.scss",
|
||||||
|
"src/styles.scss"
|
||||||
|
],
|
||||||
|
"scripts": []
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"e2e": {
|
||||||
|
"builder": "@angular-devkit/build-angular:protractor",
|
||||||
|
"options": {
|
||||||
|
"protractorConfig": "e2e/protractor.conf.js",
|
||||||
|
"devServerTarget": "ng-karaoqueue:serve"
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"devServerTarget": "ng-karaoqueue:serve:production"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"schematics": {
|
||||||
|
"@schematics/angular:component": {
|
||||||
|
"style": "scss"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
11965
frontend/ng-karaoqueue/package-lock.json
generated
Normal file
11965
frontend/ng-karaoqueue/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
51
frontend/ng-karaoqueue/package.json
Normal file
51
frontend/ng-karaoqueue/package.json
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
{
|
||||||
|
"name": "ng-karaoqueue",
|
||||||
|
"version": "0.0.0",
|
||||||
|
"scripts": {
|
||||||
|
"ng": "ng",
|
||||||
|
"start": "ng serve",
|
||||||
|
"serve": "ng serve --host=0.0.0.0",
|
||||||
|
"build": "ng build",
|
||||||
|
"test": "ng test",
|
||||||
|
"lint": "ng lint",
|
||||||
|
"e2e": "ng e2e"
|
||||||
|
},
|
||||||
|
"private": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@angular/animations": "^14.2.3",
|
||||||
|
"@angular/cdk": "^14.2.2",
|
||||||
|
"@angular/common": "^14.2.3",
|
||||||
|
"@angular/compiler": "^14.2.3",
|
||||||
|
"@angular/core": "^14.2.3",
|
||||||
|
"@angular/forms": "^14.2.3",
|
||||||
|
"@angular/material": "^14.2.2",
|
||||||
|
"@angular/platform-browser": "^14.2.3",
|
||||||
|
"@angular/platform-browser-dynamic": "^14.2.3",
|
||||||
|
"@angular/router": "^14.2.3",
|
||||||
|
"@mdi/angular-material": "^7.0.96",
|
||||||
|
"hammerjs": "^2.0.8",
|
||||||
|
"rxjs": "~7.5.6",
|
||||||
|
"tslib": "^2.4.0",
|
||||||
|
"zone.js": "~0.11.8"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@angular/cli": "^14.2.3",
|
||||||
|
"@angular/compiler-cli": "^14.2.3",
|
||||||
|
"@angular/language-service": "^14.2.3",
|
||||||
|
"@types/jasmine": "~4.3.0",
|
||||||
|
"@types/jasminewd2": "~2.0.10",
|
||||||
|
"@types/node": "~18.7.19",
|
||||||
|
"codelyzer": "^0.0.28",
|
||||||
|
"jasmine-core": "~4.4.0",
|
||||||
|
"jasmine-spec-reporter": "~7.0.0",
|
||||||
|
"karma": "~6.4.1",
|
||||||
|
"karma-chrome-launcher": "~3.1.1",
|
||||||
|
"karma-coverage-istanbul-reporter": "~3.0.3",
|
||||||
|
"karma-jasmine": "~5.1.0",
|
||||||
|
"karma-jasmine-html-reporter": "^2.0.0",
|
||||||
|
"protractor": "~7.0.0",
|
||||||
|
"ts-node": "~10.9.1",
|
||||||
|
"tslint": "~6.1.0",
|
||||||
|
"typescript": "~4.8.3"
|
||||||
|
}
|
||||||
|
}
|
16
frontend/ng-karaoqueue/src/app/app-routing.module.ts
Normal file
16
frontend/ng-karaoqueue/src/app/app-routing.module.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { EntryListingComponent } from './entry-listing/entry-listing.component';
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
import { Routes, RouterModule } from '@angular/router';
|
||||||
|
import { SongSearchComponent } from './song-search/song-search.component';
|
||||||
|
|
||||||
|
|
||||||
|
const routes: Routes = [
|
||||||
|
{path: '', component: EntryListingComponent },
|
||||||
|
{path: 'songs', component: SongSearchComponent}
|
||||||
|
];
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
imports: [RouterModule.forRoot(routes)],
|
||||||
|
exports: [RouterModule]
|
||||||
|
})
|
||||||
|
export class AppRoutingModule { }
|
11
frontend/ng-karaoqueue/src/app/app.component.html
Normal file
11
frontend/ng-karaoqueue/src/app/app.component.html
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<div>
|
||||||
|
<mat-toolbar color="primary" class="mat-elevation-z6">
|
||||||
|
<span>KaraoQueue</span>
|
||||||
|
<span> </span>
|
||||||
|
<a mat-button routerLink="/" [routerLinkActive]="['is-active']">Warteschlange</a>
|
||||||
|
<a mat-button routerLink="/songs" [routerLinkActive]="['is-active']">Songs</a>
|
||||||
|
<div class="spacer"></div>
|
||||||
|
<a mat-stroked-button>Login</a>
|
||||||
|
</mat-toolbar>
|
||||||
|
</div>
|
||||||
|
<router-outlet></router-outlet>
|
7
frontend/ng-karaoqueue/src/app/app.component.scss
Normal file
7
frontend/ng-karaoqueue/src/app/app.component.scss
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
.spacer {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.is-active {
|
||||||
|
background-color: rgba(255,255,255,0.1);
|
||||||
|
}
|
16
frontend/ng-karaoqueue/src/app/app.component.ts
Normal file
16
frontend/ng-karaoqueue/src/app/app.component.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { RuntimeConfigLoaderService } from 'runtime-config-loader';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-root',
|
||||||
|
templateUrl: './app.component.html',
|
||||||
|
styleUrls: ['./app.component.scss']
|
||||||
|
})
|
||||||
|
export class AppComponent implements OnInit{
|
||||||
|
|
||||||
|
constructor(private configSvc: RuntimeConfigLoaderService) {}
|
||||||
|
ngOnInit(): void {
|
||||||
|
console.log("API at ",this.configSvc.getConfigObjectKey("api"));
|
||||||
|
}
|
||||||
|
title = 'KaraoQueue';
|
||||||
|
}
|
107
frontend/ng-karaoqueue/src/app/app.module.ts
Normal file
107
frontend/ng-karaoqueue/src/app/app.module.ts
Normal file
@ -0,0 +1,107 @@
|
|||||||
|
import { BrowserModule, DomSanitizer } from '@angular/platform-browser';
|
||||||
|
import { NgModule } from '@angular/core';
|
||||||
|
|
||||||
|
import { AppRoutingModule } from './app-routing.module';
|
||||||
|
import { AppComponent } from './app.component';
|
||||||
|
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||||
|
import { MatAutocompleteModule } from '@angular/material/autocomplete';
|
||||||
|
import { MatBadgeModule } from '@angular/material/badge';
|
||||||
|
import { MatBottomSheetModule } from '@angular/material/bottom-sheet';
|
||||||
|
import { MatButtonModule } from '@angular/material/button';
|
||||||
|
import { MatButtonToggleModule } from '@angular/material/button-toggle';
|
||||||
|
import { MatCardModule } from '@angular/material/card';
|
||||||
|
import { MatCheckboxModule } from '@angular/material/checkbox';
|
||||||
|
import { MatChipsModule } from '@angular/material/chips';
|
||||||
|
import { MatStepperModule } from '@angular/material/stepper';
|
||||||
|
import { MatDatepickerModule } from '@angular/material/datepicker';
|
||||||
|
import { MatDialogModule } from '@angular/material/dialog';
|
||||||
|
import { MatDividerModule } from '@angular/material/divider';
|
||||||
|
import { MatExpansionModule } from '@angular/material/expansion';
|
||||||
|
import { MatGridListModule } from '@angular/material/grid-list';
|
||||||
|
import { MatIconRegistry, MatIconModule } from '@angular/material/icon';
|
||||||
|
import { MatInputModule } from '@angular/material/input';
|
||||||
|
import { MatListModule } from '@angular/material/list';
|
||||||
|
import { MatMenuModule } from '@angular/material/menu';
|
||||||
|
import { MatNativeDateModule, MatRippleModule } from '@angular/material/core';
|
||||||
|
import { MatPaginatorModule } from '@angular/material/paginator';
|
||||||
|
import { MatProgressBarModule } from '@angular/material/progress-bar';
|
||||||
|
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
||||||
|
import { MatRadioModule } from '@angular/material/radio';
|
||||||
|
import { MatSelectModule } from '@angular/material/select';
|
||||||
|
import { MatSidenavModule } from '@angular/material/sidenav';
|
||||||
|
import { MatSliderModule } from '@angular/material/slider';
|
||||||
|
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
|
||||||
|
import { MatSnackBarModule } from '@angular/material/snack-bar';
|
||||||
|
import { MatSortModule } from '@angular/material/sort';
|
||||||
|
import { MatTableModule } from '@angular/material/table';
|
||||||
|
import { MatTabsModule } from '@angular/material/tabs';
|
||||||
|
import { MatToolbarModule } from '@angular/material/toolbar';
|
||||||
|
import { MatTooltipModule } from '@angular/material/tooltip';
|
||||||
|
import { MatTreeModule } from '@angular/material/tree';
|
||||||
|
|
||||||
|
import { HttpClientModule } from '@angular/common/http';
|
||||||
|
|
||||||
|
|
||||||
|
import { EntryListingComponent } from './entry-listing/entry-listing.component';
|
||||||
|
import { SongSearchComponent } from './song-search/song-search.component';
|
||||||
|
|
||||||
|
import { debounceTime, distinctUntilChanged } from "rxjs/operators";
|
||||||
|
|
||||||
|
import { RuntimeConfigLoaderModule } from 'runtime-config-loader';
|
||||||
|
|
||||||
|
@NgModule({
|
||||||
|
declarations: [
|
||||||
|
AppComponent,
|
||||||
|
EntryListingComponent,
|
||||||
|
SongSearchComponent
|
||||||
|
],
|
||||||
|
imports: [
|
||||||
|
BrowserModule,
|
||||||
|
AppRoutingModule,
|
||||||
|
BrowserAnimationsModule,
|
||||||
|
MatAutocompleteModule,
|
||||||
|
MatBadgeModule,
|
||||||
|
MatBottomSheetModule,
|
||||||
|
MatButtonModule,
|
||||||
|
MatButtonToggleModule,
|
||||||
|
MatCardModule,
|
||||||
|
MatCheckboxModule,
|
||||||
|
MatChipsModule,
|
||||||
|
MatStepperModule,
|
||||||
|
MatDatepickerModule,
|
||||||
|
MatDialogModule,
|
||||||
|
MatDividerModule,
|
||||||
|
MatExpansionModule,
|
||||||
|
MatGridListModule,
|
||||||
|
MatIconModule,
|
||||||
|
MatInputModule,
|
||||||
|
MatListModule,
|
||||||
|
MatMenuModule,
|
||||||
|
MatNativeDateModule,
|
||||||
|
MatPaginatorModule,
|
||||||
|
MatProgressBarModule,
|
||||||
|
MatProgressSpinnerModule,
|
||||||
|
MatRadioModule,
|
||||||
|
MatRippleModule,
|
||||||
|
MatSelectModule,
|
||||||
|
MatSidenavModule,
|
||||||
|
MatSliderModule,
|
||||||
|
MatSlideToggleModule,
|
||||||
|
MatSnackBarModule,
|
||||||
|
MatSortModule,
|
||||||
|
MatTableModule,
|
||||||
|
MatTabsModule,
|
||||||
|
MatToolbarModule,
|
||||||
|
MatTooltipModule,
|
||||||
|
MatTreeModule,
|
||||||
|
HttpClientModule,
|
||||||
|
RuntimeConfigLoaderModule
|
||||||
|
],
|
||||||
|
providers: [],
|
||||||
|
bootstrap: [AppComponent]
|
||||||
|
})
|
||||||
|
export class AppModule {
|
||||||
|
constructor(matIconRegistry: MatIconRegistry, domSanitizer: DomSanitizer) {
|
||||||
|
matIconRegistry.addSvgIconSet(domSanitizer.bypassSecurityTrustResourceUrl('./assets/mdi.svg'));
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1 @@
|
|||||||
|
<p>entry-listing works!</p>
|
@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { EntryListingComponent } from './entry-listing.component';
|
||||||
|
|
||||||
|
describe('EntryListingComponent', () => {
|
||||||
|
let component: EntryListingComponent;
|
||||||
|
let fixture: ComponentFixture<EntryListingComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ EntryListingComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(EntryListingComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
@ -0,0 +1,15 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-entry-listing',
|
||||||
|
templateUrl: './entry-listing.component.html',
|
||||||
|
styleUrls: ['./entry-listing.component.scss']
|
||||||
|
})
|
||||||
|
export class EntryListingComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor() { }
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
16
frontend/ng-karaoqueue/src/app/entry-service.service.spec.ts
Normal file
16
frontend/ng-karaoqueue/src/app/entry-service.service.spec.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { EntryServiceService } from './entry-service.service';
|
||||||
|
|
||||||
|
describe('EntryServiceService', () => {
|
||||||
|
let service: EntryServiceService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(EntryServiceService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
25
frontend/ng-karaoqueue/src/app/entry-service.service.ts
Normal file
25
frontend/ng-karaoqueue/src/app/entry-service.service.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { HttpClient } from '@angular/common/http';
|
||||||
|
import { RuntimeConfigLoaderService } from 'runtime-config-loader';
|
||||||
|
import { Entry } from './models/entry.model';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class EntryServiceService {
|
||||||
|
|
||||||
|
private api: string;
|
||||||
|
constructor(
|
||||||
|
private http: HttpClient,
|
||||||
|
private configSvc: RuntimeConfigLoaderService
|
||||||
|
) {
|
||||||
|
this.api = configSvc.getConfigObjectKey("api");
|
||||||
|
}
|
||||||
|
|
||||||
|
getEntries(): Observable<Array<Entry>> {
|
||||||
|
return null; // TODO
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
10
frontend/ng-karaoqueue/src/app/models/artist.model.ts
Normal file
10
frontend/ng-karaoqueue/src/app/models/artist.model.ts
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
export class Artist {
|
||||||
|
|
||||||
|
constructor(id: number, name: string) {
|
||||||
|
this.id = id;
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
}
|
12
frontend/ng-karaoqueue/src/app/models/entry.model.ts
Normal file
12
frontend/ng-karaoqueue/src/app/models/entry.model.ts
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
export class Entry {
|
||||||
|
|
||||||
|
constructor(singer_name: string, song: string, auth_cookie?: string) {
|
||||||
|
this.singer_name=singer_name;
|
||||||
|
this.song=song;
|
||||||
|
this.auth_cookie = auth_cookie;
|
||||||
|
}
|
||||||
|
|
||||||
|
singer_name: string;
|
||||||
|
song: string; //Actually the ID of the Song
|
||||||
|
auth_cookie?: string; //The "cookie" to authenticate for changing an entry. Null otherwise
|
||||||
|
}
|
16
frontend/ng-karaoqueue/src/app/models/genre.model.ts
Normal file
16
frontend/ng-karaoqueue/src/app/models/genre.model.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
export class Genre {
|
||||||
|
|
||||||
|
constructor(id: number, name: string) {
|
||||||
|
this.id = id;
|
||||||
|
this._name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public get name() : string {
|
||||||
|
return this._name;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
id: number;
|
||||||
|
_name: string;
|
||||||
|
}
|
10
frontend/ng-karaoqueue/src/app/models/language.model.ts
Normal file
10
frontend/ng-karaoqueue/src/app/models/language.model.ts
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
export class Language {
|
||||||
|
|
||||||
|
constructor(id: number, name: string) {
|
||||||
|
this.id = id;
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
id: number;
|
||||||
|
name: string;
|
||||||
|
}
|
26
frontend/ng-karaoqueue/src/app/models/song.model.ts
Normal file
26
frontend/ng-karaoqueue/src/app/models/song.model.ts
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
import { Genre } from './genre.model';
|
||||||
|
import { Language } from './language.model';
|
||||||
|
import { Artist } from './artist.model';
|
||||||
|
|
||||||
|
export class Song {
|
||||||
|
|
||||||
|
constructor(title: string, artist: Artist, karafun_id: number, duet: boolean, explicit: boolean, id: number, genres: Array<String>, languages: Array<String>) {
|
||||||
|
this.title=title;
|
||||||
|
this.artist=artist;
|
||||||
|
this.karafun_id=karafun_id;
|
||||||
|
this.duet=duet;
|
||||||
|
this.explicit=explicit;
|
||||||
|
this.id=id;
|
||||||
|
this.genres=genres;
|
||||||
|
this.languages=languages;
|
||||||
|
}
|
||||||
|
|
||||||
|
title: string;
|
||||||
|
artist: Artist;
|
||||||
|
karafun_id: number;
|
||||||
|
duet: boolean;
|
||||||
|
explicit: boolean;
|
||||||
|
id: number;
|
||||||
|
genres: Array<String>;
|
||||||
|
languages: Array<String>;
|
||||||
|
}
|
@ -0,0 +1,48 @@
|
|||||||
|
<div class="content">
|
||||||
|
<mat-form-field class="search-input">
|
||||||
|
<mat-label>Suche...</mat-label>
|
||||||
|
<mat-icon matSuffix svgIcon="magnify"></mat-icon>
|
||||||
|
<input type="text" matInput placeholder="Tippe einen Künstler oder Song..."
|
||||||
|
(keyup)="applyFilter($event.target.value)">
|
||||||
|
</mat-form-field>
|
||||||
|
</div>
|
||||||
|
<div class="resultcontainer">
|
||||||
|
<mat-list *ngFor="let song of songs">
|
||||||
|
<mat-card class="result">
|
||||||
|
<div class="card-left">
|
||||||
|
<mat-card-title>{{song.artist}} - {{song.title}}</mat-card-title>
|
||||||
|
<div class="song-info">
|
||||||
|
<div class="info-icons">
|
||||||
|
<ng-template [ngIf]="song.duet==true" [ngIfElse]="nonduet">
|
||||||
|
<mat-icon svgIcon="account-multiple"></mat-icon>
|
||||||
|
</ng-template>
|
||||||
|
<ng-template #nonduet>
|
||||||
|
<mat-icon svgIcon="account"></mat-icon>
|
||||||
|
</ng-template>
|
||||||
|
<ng-template [ngIf]="song.explicit==true" [ngIfElse]="nonexplicit">
|
||||||
|
<mat-icon svgIcon="alpha-e-box"></mat-icon>
|
||||||
|
</ng-template>
|
||||||
|
<ng-template #nonexplicit>
|
||||||
|
<mat-icon svgIcon="alpha-e-box" class="icon-disabled"></mat-icon>
|
||||||
|
</ng-template>
|
||||||
|
</div>
|
||||||
|
<div class="genre-list">
|
||||||
|
<mat-icon svgIcon="music-circle"></mat-icon>
|
||||||
|
<mat-chip-list *ngFor="let genre of song.genres">
|
||||||
|
<mat-chip>{{genre}}</mat-chip>
|
||||||
|
</mat-chip-list>
|
||||||
|
</div>
|
||||||
|
<div class="language-list">
|
||||||
|
<mat-icon svgIcon="account-voice"></mat-icon>
|
||||||
|
<mat-chip-list *ngFor="let language of song.languages">
|
||||||
|
<mat-chip>{{language}}</mat-chip>
|
||||||
|
</mat-chip-list>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button mat-flat-button color="accent" class="add-button">
|
||||||
|
<mat-icon svgIcon="playlist-plus"></mat-icon>
|
||||||
|
</button>
|
||||||
|
</mat-card>
|
||||||
|
</mat-list>
|
||||||
|
</div>
|
@ -0,0 +1,120 @@
|
|||||||
|
.search-input {
|
||||||
|
width: 95%;
|
||||||
|
margin-top: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.add-button {
|
||||||
|
height: 3rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content {
|
||||||
|
overflow: hidden;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.resultcontainer {
|
||||||
|
overflow: hidden;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.result {
|
||||||
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
|
width: 90%;
|
||||||
|
margin-top: 0.2rem;
|
||||||
|
display: flex;
|
||||||
|
align-items: stretch;
|
||||||
|
justify-content: space-between;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-left {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.song-info {
|
||||||
|
box-sizing: border-box;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.song-info > * {
|
||||||
|
margin-right: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-disabled {
|
||||||
|
opacity: 0.1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.genre-list > mat-icon {
|
||||||
|
padding-right: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.genre-list mat-chip-list {
|
||||||
|
margin-right: 0.15rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.genre-list {
|
||||||
|
overflow-x: scroll;
|
||||||
|
overflow-y: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
padding-bottom: 0.25rem;
|
||||||
|
align-items: center;
|
||||||
|
-webkit-mask-image: linear-gradient(to right, rgba(0,0,0,0) 0%,rgba(0,0,0,1) 2px,rgba(0,0,0,1) calc(100% - 2px),rgba(0,0,0,0) 100%);
|
||||||
|
mask-image: linear-gradient(to right, rgba(0,0,0,0) 0%,rgba(0,0,0,1) 2px,rgba(0,0,0,1) calc(100% - 2px),rgba(0,0,0,0) 100%);
|
||||||
|
-ms-overflow-style: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.language-list > mat-icon {
|
||||||
|
padding-right: 0.25rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.language-list mat-chip-list {
|
||||||
|
margin-right: 0.15rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.genre-list::-webkit-scrollbar {
|
||||||
|
width: 0px;
|
||||||
|
height: 0px;
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.language-list {
|
||||||
|
overflow-x: scroll;
|
||||||
|
overflow-y: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
padding-bottom: 0.25rem;
|
||||||
|
align-items: center;
|
||||||
|
-ms-overflow-style: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.language-list::-webkit-scrollbar {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$breakpoint-tablet: 768px;
|
||||||
|
@media (min-width: $breakpoint-tablet) {
|
||||||
|
.result {
|
||||||
|
flex-direction: row;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
.add-button {
|
||||||
|
height: 6.5rem;
|
||||||
|
width: 4rem;
|
||||||
|
align-self: center;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { SongSearchComponent } from './song-search.component';
|
||||||
|
|
||||||
|
describe('SongSearchComponent', () => {
|
||||||
|
let component: SongSearchComponent;
|
||||||
|
let fixture: ComponentFixture<SongSearchComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ SongSearchComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(SongSearchComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
@ -0,0 +1,43 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { SongServiceService } from "../song-service.service";
|
||||||
|
import { Song } from '../models/song.model';
|
||||||
|
import { Subject } from 'rxjs';
|
||||||
|
import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-song-search',
|
||||||
|
templateUrl: './song-search.component.html',
|
||||||
|
styleUrls: ['./song-search.component.scss']
|
||||||
|
})
|
||||||
|
export class SongSearchComponent implements OnInit {
|
||||||
|
|
||||||
|
private searchSub$ = new Subject<string>();
|
||||||
|
|
||||||
|
constructor(private songServiceService: SongServiceService) { }
|
||||||
|
|
||||||
|
songs: Array<Song> = new Array<Song>();
|
||||||
|
|
||||||
|
updateSongs(text: string) {
|
||||||
|
this.songServiceService.searchSongByText(text).subscribe(x => {
|
||||||
|
console.log(x);
|
||||||
|
this.songs = x;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
applyFilter(filterValue: string) {
|
||||||
|
this.searchSub$.next(filterValue)
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.searchSub$.pipe(
|
||||||
|
debounceTime(400),
|
||||||
|
distinctUntilChanged()
|
||||||
|
).subscribe((filterValue: string) => {
|
||||||
|
this.updateSongs(filterValue);
|
||||||
|
});
|
||||||
|
|
||||||
|
//Für Testzwecke
|
||||||
|
this.updateSongs("Test");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
16
frontend/ng-karaoqueue/src/app/song-service.service.spec.ts
Normal file
16
frontend/ng-karaoqueue/src/app/song-service.service.spec.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { SongServiceService } from './song-service.service';
|
||||||
|
|
||||||
|
describe('SongServiceService', () => {
|
||||||
|
let service: SongServiceService;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(SongServiceService);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
42
frontend/ng-karaoqueue/src/app/song-service.service.ts
Normal file
42
frontend/ng-karaoqueue/src/app/song-service.service.ts
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { HttpClient, HttpHeaders } from "@angular/common/http";
|
||||||
|
import { Song } from './models/song.model';
|
||||||
|
import { Artist } from './models/artist.model';
|
||||||
|
import { Genre } from './models/genre.model';
|
||||||
|
import { Language } from './models/language.model';
|
||||||
|
import { RuntimeConfigLoaderService } from 'runtime-config-loader';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class SongServiceService {
|
||||||
|
|
||||||
|
private api: string;
|
||||||
|
constructor(
|
||||||
|
private http: HttpClient,
|
||||||
|
private configSvc: RuntimeConfigLoaderService
|
||||||
|
) {
|
||||||
|
this.api=configSvc.getConfigObjectKey("api");
|
||||||
|
}
|
||||||
|
|
||||||
|
searchSongByText(text: string): Observable<Array<Song>> {
|
||||||
|
|
||||||
|
|
||||||
|
let out = new Array<Song>();
|
||||||
|
|
||||||
|
this.http.get(this.api +"/songs/compl?search="+text).subscribe((data: Observable<JSON>) => {
|
||||||
|
data.forEach(element => {
|
||||||
|
out.push(new Song(element["title"],element["artist"],element["karafun_id"],element["duo"],element["explicit"],element["_id"],element["styles"],element["languages"]));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const observable = new Observable<Array<Song>>( subscriber => {
|
||||||
|
subscriber.next(out);
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
return observable;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
3
frontend/ng-karaoqueue/src/assets/config.json
Normal file
3
frontend/ng-karaoqueue/src/assets/config.json
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"api":"http://localhost:5000/api"
|
||||||
|
}
|
280
frontend/ng-karaoqueue/src/custom-theme.scss
Normal file
280
frontend/ng-karaoqueue/src/custom-theme.scss
Normal file
@ -0,0 +1,280 @@
|
|||||||
|
/**
|
||||||
|
* Generated theme by Material Theme Generator
|
||||||
|
* https://materialtheme.arcsine.dev
|
||||||
|
*/
|
||||||
|
|
||||||
|
@import '@angular/material/theming';
|
||||||
|
// Include the common styles for Angular Material. We include this here so that you only
|
||||||
|
// have to load a single css file for Angular Material in your app.
|
||||||
|
|
||||||
|
// Fonts
|
||||||
|
@import 'https://fonts.googleapis.com/css?family=Material+Icons';
|
||||||
|
@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,500');
|
||||||
|
|
||||||
|
$fontConfig: (
|
||||||
|
display-4: mat-typography-level(112px, 112px, 300, 'Roboto', -0.0134em),
|
||||||
|
display-3: mat-typography-level(56px, 56px, 400, 'Roboto', -0.0089em),
|
||||||
|
display-2: mat-typography-level(45px, 48px, 400, 'Roboto', 0.0000em),
|
||||||
|
display-1: mat-typography-level(34px, 40px, 400, 'Roboto', 0.0074em),
|
||||||
|
headline: mat-typography-level(24px, 32px, 400, 'Roboto', 0.0000em),
|
||||||
|
title: mat-typography-level(20px, 32px, 500, 'Roboto', 0.0075em),
|
||||||
|
subheading-2: mat-typography-level(16px, 28px, 400, 'Roboto', 0.0094em),
|
||||||
|
subheading-1: mat-typography-level(15px, 24px, 500, 'Roboto', 0.0067em),
|
||||||
|
body-2: mat-typography-level(14px, 24px, 500, 'Roboto', 0.0179em),
|
||||||
|
body-1: mat-typography-level(14px, 20px, 400, 'Roboto', 0.0179em),
|
||||||
|
button: mat-typography-level(14px, 14px, 500, 'Roboto', 0.0893em),
|
||||||
|
caption: mat-typography-level(12px, 20px, 400, 'Roboto', 0.0333em),
|
||||||
|
input: mat-typography-level(inherit, 1.125, 400, 'Roboto', 1.5px)
|
||||||
|
);
|
||||||
|
|
||||||
|
// Foreground Elements
|
||||||
|
|
||||||
|
// Light Theme Text
|
||||||
|
$dark-text: #000000;
|
||||||
|
$dark-primary-text: rgba($dark-text, 0.87);
|
||||||
|
$dark-accent-text: rgba($dark-primary-text, 0.54);
|
||||||
|
$dark-disabled-text: rgba($dark-primary-text, 0.38);
|
||||||
|
$dark-dividers: rgba($dark-primary-text, 0.12);
|
||||||
|
$dark-focused: rgba($dark-primary-text, 0.12);
|
||||||
|
|
||||||
|
$mat-light-theme-foreground: (
|
||||||
|
base: black,
|
||||||
|
divider: $dark-dividers,
|
||||||
|
dividers: $dark-dividers,
|
||||||
|
disabled: $dark-disabled-text,
|
||||||
|
disabled-button: rgba($dark-text, 0.26),
|
||||||
|
disabled-text: $dark-disabled-text,
|
||||||
|
elevation: black,
|
||||||
|
secondary-text: $dark-accent-text,
|
||||||
|
hint-text: $dark-disabled-text,
|
||||||
|
accent-text: $dark-accent-text,
|
||||||
|
icon: $dark-accent-text,
|
||||||
|
icons: $dark-accent-text,
|
||||||
|
text: $dark-primary-text,
|
||||||
|
slider-min: $dark-primary-text,
|
||||||
|
slider-off: rgba($dark-text, 0.26),
|
||||||
|
slider-off-active: $dark-disabled-text,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Dark Theme text
|
||||||
|
$light-text: #ffffff;
|
||||||
|
$light-primary-text: $light-text;
|
||||||
|
$light-accent-text: rgba($light-primary-text, 0.7);
|
||||||
|
$light-disabled-text: rgba($light-primary-text, 0.5);
|
||||||
|
$light-dividers: rgba($light-primary-text, 0.12);
|
||||||
|
$light-focused: rgba($light-primary-text, 0.12);
|
||||||
|
|
||||||
|
$mat-dark-theme-foreground: (
|
||||||
|
base: $light-text,
|
||||||
|
divider: $light-dividers,
|
||||||
|
dividers: $light-dividers,
|
||||||
|
disabled: $light-disabled-text,
|
||||||
|
disabled-button: rgba($light-text, 0.3),
|
||||||
|
disabled-text: $light-disabled-text,
|
||||||
|
elevation: black,
|
||||||
|
hint-text: $light-disabled-text,
|
||||||
|
secondary-text: $light-accent-text,
|
||||||
|
accent-text: $light-accent-text,
|
||||||
|
icon: $light-text,
|
||||||
|
icons: $light-text,
|
||||||
|
text: $light-text,
|
||||||
|
slider-min: $light-text,
|
||||||
|
slider-off: rgba($light-text, 0.3),
|
||||||
|
slider-off-active: rgba($light-text, 0.3),
|
||||||
|
);
|
||||||
|
|
||||||
|
// Background config
|
||||||
|
// Light bg
|
||||||
|
$light-background: #fafafa;
|
||||||
|
$light-bg-darker-5: darken($light-background, 5%);
|
||||||
|
$light-bg-darker-10: darken($light-background, 10%);
|
||||||
|
$light-bg-darker-20: darken($light-background, 20%);
|
||||||
|
$light-bg-darker-30: darken($light-background, 30%);
|
||||||
|
$light-bg-lighter-5: lighten($light-background, 5%);
|
||||||
|
$dark-bg-tooltip: lighten(#2c2c2c, 20%);
|
||||||
|
$dark-bg-alpha-4: rgba(#2c2c2c, 0.04);
|
||||||
|
$dark-bg-alpha-12: rgba(#2c2c2c, 0.12);
|
||||||
|
|
||||||
|
$mat-light-theme-background: (
|
||||||
|
background: $light-background,
|
||||||
|
status-bar: $light-bg-darker-20,
|
||||||
|
app-bar: $light-bg-darker-5,
|
||||||
|
hover: $dark-bg-alpha-4,
|
||||||
|
card: $light-bg-lighter-5,
|
||||||
|
dialog: $light-bg-lighter-5,
|
||||||
|
tooltip: $dark-bg-tooltip,
|
||||||
|
disabled-button: $dark-bg-alpha-12,
|
||||||
|
raised-button: $light-bg-lighter-5,
|
||||||
|
focused-button: $dark-focused,
|
||||||
|
selected-button: $light-bg-darker-20,
|
||||||
|
selected-disabled-button: $light-bg-darker-30,
|
||||||
|
disabled-button-toggle: $light-bg-darker-10,
|
||||||
|
unselected-chip: $light-bg-darker-10,
|
||||||
|
disabled-list-option: $light-bg-darker-10,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Dark bg
|
||||||
|
$dark-background: #2c2c2c;
|
||||||
|
$dark-bg-lighter-5: lighten($dark-background, 5%);
|
||||||
|
$dark-bg-lighter-10: lighten($dark-background, 10%);
|
||||||
|
$dark-bg-lighter-20: lighten($dark-background, 20%);
|
||||||
|
$dark-bg-lighter-30: lighten($dark-background, 30%);
|
||||||
|
$light-bg-alpha-4: rgba(#fafafa, 0.04);
|
||||||
|
$light-bg-alpha-12: rgba(#fafafa, 0.12);
|
||||||
|
|
||||||
|
// Background palette for dark themes.
|
||||||
|
$mat-dark-theme-background: (
|
||||||
|
background: $dark-background,
|
||||||
|
status-bar: $dark-bg-lighter-20,
|
||||||
|
app-bar: $dark-bg-lighter-5,
|
||||||
|
hover: $light-bg-alpha-4,
|
||||||
|
card: $dark-bg-lighter-5,
|
||||||
|
dialog: $dark-bg-lighter-5,
|
||||||
|
tooltip: $dark-bg-lighter-20,
|
||||||
|
disabled-button: $light-bg-alpha-12,
|
||||||
|
raised-button: $dark-bg-lighter-5,
|
||||||
|
focused-button: $light-focused,
|
||||||
|
selected-button: $dark-bg-lighter-20,
|
||||||
|
selected-disabled-button: $dark-bg-lighter-30,
|
||||||
|
disabled-button-toggle: $dark-bg-lighter-10,
|
||||||
|
unselected-chip: $dark-bg-lighter-20,
|
||||||
|
disabled-list-option: $dark-bg-lighter-10,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Compute font config
|
||||||
|
@include mat-core($fontConfig);
|
||||||
|
|
||||||
|
// Theme Config
|
||||||
|
|
||||||
|
body {
|
||||||
|
--primary-color: #090a28;
|
||||||
|
--primary-lighter-color: #b5b6bf;
|
||||||
|
--primary-darker-color: #050518;
|
||||||
|
--text-primary-color: #{$light-primary-text};
|
||||||
|
--text-primary-lighter-color: #{$dark-primary-text};
|
||||||
|
--text-primary-darker-color: #{$light-primary-text};
|
||||||
|
}
|
||||||
|
|
||||||
|
$mat-primary: (
|
||||||
|
main: #090a28,
|
||||||
|
lighter: #b5b6bf,
|
||||||
|
darker: #050518,
|
||||||
|
200: #090a28, // For slide toggle,
|
||||||
|
contrast : (
|
||||||
|
main: $light-primary-text,
|
||||||
|
lighter: $dark-primary-text,
|
||||||
|
darker: $light-primary-text,
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$theme-primary: mat-palette($mat-primary, main, lighter, darker);
|
||||||
|
|
||||||
|
body {
|
||||||
|
--accent-color: #b70000;
|
||||||
|
--accent-lighter-color: #e9b3b3;
|
||||||
|
--accent-darker-color: #9f0000;
|
||||||
|
--text-accent-color: #{$light-primary-text};
|
||||||
|
--text-accent-lighter-color: #{$dark-primary-text};
|
||||||
|
--text-accent-darker-color: #{$light-primary-text};
|
||||||
|
}
|
||||||
|
|
||||||
|
$mat-accent: (
|
||||||
|
main: #b70000,
|
||||||
|
lighter: #e9b3b3,
|
||||||
|
darker: #9f0000,
|
||||||
|
200: #b70000, // For slide toggle,
|
||||||
|
contrast : (
|
||||||
|
main: $light-primary-text,
|
||||||
|
lighter: $dark-primary-text,
|
||||||
|
darker: $light-primary-text,
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$theme-accent: mat-palette($mat-accent, main, lighter, darker);
|
||||||
|
|
||||||
|
body {
|
||||||
|
--warn-color: #ffc600;
|
||||||
|
--warn-lighter-color: #ffeeb3;
|
||||||
|
--warn-darker-color: #ffb100;
|
||||||
|
--text-warn-color: #{$dark-primary-text};
|
||||||
|
--text-warn-lighter-color: #{$dark-primary-text};
|
||||||
|
--text-warn-darker-color: #{$dark-primary-text};
|
||||||
|
}
|
||||||
|
|
||||||
|
$mat-warn: (
|
||||||
|
main: #ffc600,
|
||||||
|
lighter: #ffeeb3,
|
||||||
|
darker: #ffb100,
|
||||||
|
200: #ffc600, // For slide toggle,
|
||||||
|
contrast : (
|
||||||
|
main: $dark-primary-text,
|
||||||
|
lighter: $dark-primary-text,
|
||||||
|
darker: $dark-primary-text,
|
||||||
|
)
|
||||||
|
);
|
||||||
|
$theme-warn: mat-palette($mat-warn, main, lighter, darker);;
|
||||||
|
|
||||||
|
$theme: mat-dark-theme($theme-primary, $theme-accent, $theme-warn);
|
||||||
|
$altTheme: mat-light-theme($theme-primary, $theme-accent, $theme-warn);
|
||||||
|
|
||||||
|
// Theme Init
|
||||||
|
@include angular-material-theme($theme);
|
||||||
|
|
||||||
|
.theme-alternate {
|
||||||
|
@include angular-material-theme($altTheme);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Specific component overrides, pieces that are not in line with the general theming
|
||||||
|
|
||||||
|
// Handle buttons appropriately, with respect to line-height
|
||||||
|
.mat-raised-button, .mat-stroked-button, .mat-flat-button {
|
||||||
|
padding: 0 1.15em;
|
||||||
|
margin: 0 .65em;
|
||||||
|
min-width: 3em;
|
||||||
|
line-height: 36.4px
|
||||||
|
}
|
||||||
|
|
||||||
|
.mat-standard-chip {
|
||||||
|
padding: .5em .85em;
|
||||||
|
min-height: 2.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.material-icons {
|
||||||
|
font-size: 24px;
|
||||||
|
font-family: 'Material Icons', 'Material Icons';
|
||||||
|
.mat-badge-content {
|
||||||
|
font-family: 'Roboto';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mat-form-field.mat-form-field {
|
||||||
|
&.mat-focused {
|
||||||
|
.mat-form-field-label {
|
||||||
|
color: $light-text;
|
||||||
|
}
|
||||||
|
.mat-form-field-ripple {
|
||||||
|
background-color: $light-text !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.mat-form-field-label.mat-focused,
|
||||||
|
.mat-form-field.mat-focused.matform-field-should-float {
|
||||||
|
color: $light-text;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mat-form-field-underline, .mat-form-field-label {
|
||||||
|
color: $light-accent-text;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mat-form-field-underline.mat-focused {
|
||||||
|
background-color: $light-text;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
button.mat-menu-item {
|
||||||
|
line-height: 24px !important;
|
||||||
|
}
|
||||||
|
a.mat-menu-item > mat-icon {
|
||||||
|
margin-bottom: 14px;
|
||||||
|
}
|
||||||
|
.mat-icon svg {
|
||||||
|
height: 24px;
|
||||||
|
width: 24px;
|
||||||
|
}
|
15
frontend/ng-karaoqueue/src/index.html
Normal file
15
frontend/ng-karaoqueue/src/index.html
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<title>NgKaraoqueue</title>
|
||||||
|
<base href="/">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<link rel="icon" type="image/x-icon" href="favicon.ico">
|
||||||
|
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500&display=swap" rel="stylesheet">
|
||||||
|
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
|
||||||
|
</head>
|
||||||
|
<body class="mat-typography mat-app-background">
|
||||||
|
<app-root></app-root>
|
||||||
|
</body>
|
||||||
|
</html>
|
10
frontend/ng-karaoqueue/src/styles.scss
Normal file
10
frontend/ng-karaoqueue/src/styles.scss
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
/* You can add global styles to this file, and also import other style files */
|
||||||
|
html,
|
||||||
|
body {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
font-family: Roboto, "Helvetica Neue", sans-serif;
|
||||||
|
}
|
14
frontend/ng-karaoqueue/tsconfig.app.json
Normal file
14
frontend/ng-karaoqueue/tsconfig.app.json
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||||
|
{
|
||||||
|
"extends": "./tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "./out-tsc/app",
|
||||||
|
"types": []
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"src/app/app.module.ts",
|
||||||
|
],
|
||||||
|
"include": [
|
||||||
|
"src/**/*.d.ts"
|
||||||
|
]
|
||||||
|
}
|
32
frontend/ng-karaoqueue/tsconfig.json
Normal file
32
frontend/ng-karaoqueue/tsconfig.json
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||||
|
{
|
||||||
|
"compileOnSave": false,
|
||||||
|
"compilerOptions": {
|
||||||
|
"baseUrl": "./",
|
||||||
|
"outDir": "./dist/out-tsc",
|
||||||
|
"forceConsistentCasingInFileNames": true,
|
||||||
|
"strict": true,
|
||||||
|
"noImplicitOverride": true,
|
||||||
|
"noPropertyAccessFromIndexSignature": true,
|
||||||
|
"noImplicitReturns": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"sourceMap": true,
|
||||||
|
"declaration": false,
|
||||||
|
"downlevelIteration": true,
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"moduleResolution": "node",
|
||||||
|
"importHelpers": true,
|
||||||
|
"target": "es2020",
|
||||||
|
"module": "es2020",
|
||||||
|
"lib": [
|
||||||
|
"es2020",
|
||||||
|
"dom"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"angularCompilerOptions": {
|
||||||
|
"enableI18nLegacyMessageIdFormat": false,
|
||||||
|
"strictInjectionParameters": true,
|
||||||
|
"strictInputAccessModifiers": true,
|
||||||
|
"strictTemplates": true
|
||||||
|
}
|
||||||
|
}
|
18
frontend/ng-karaoqueue/tsconfig.spec.json
Normal file
18
frontend/ng-karaoqueue/tsconfig.spec.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
/* To learn more about this file see: https://angular.io/config/tsconfig. */
|
||||||
|
{
|
||||||
|
"extends": "./tsconfig.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"outDir": "./out-tsc/spec",
|
||||||
|
"types": [
|
||||||
|
"jasmine"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"src/test.ts",
|
||||||
|
"src/polyfills.ts"
|
||||||
|
],
|
||||||
|
"include": [
|
||||||
|
"src/**/*.spec.ts",
|
||||||
|
"src/**/*.d.ts"
|
||||||
|
]
|
||||||
|
}
|
Reference in New Issue
Block a user