From ebf3d29fa811148b7637a247fb564a4b3482e87f Mon Sep 17 00:00:00 2001 From: Leonardo Segala Date: Sat, 2 Aug 2025 07:59:50 +0200 Subject: [PATCH 1/3] Fix nasty assert --- backend/Dockerfile | 3 ++- backend/requirements.txt | 3 ++- backend/src/app.py | 14 +++++++------- backend/src/room.py | 2 +- backend/src/song.py | 2 +- backend/src/state.py | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index c6a1412..3390030 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -12,5 +12,6 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . EXPOSE 5000 -CMD ["flask", "--app", "src.app", "run", "--debug", "--host=0.0.0.0"] +# CMD ["flask", "--app", "src.app", "run", "--debug", "--host=0.0.0.0"] +CMD ["python3", "src/app.py"] # flask --app src.app run --host=0.0.0.0 --port=5001 --debug diff --git a/backend/requirements.txt b/backend/requirements.txt index 5eae02e..cb18a70 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -4,4 +4,5 @@ flask-socketio dotenv requests qrcode -Pillow \ No newline at end of file +Pillow +eventlet>=0.33 diff --git a/backend/src/app.py b/backend/src/app.py index c11cf37..d4b5648 100644 --- a/backend/src/app.py +++ b/backend/src/app.py @@ -5,12 +5,12 @@ from flask import Flask, Response, jsonify, request from flask_cors import CORS from flask_socketio import SocketIO, join_room, leave_room -from .state import State -from .connect import get_connection -from .room import Room -from .song import Song, init_db, get_song_by_title_artist, add_song_in_db, get_song_by_uuid -from .song_fetch import query_search, yt_get_audio_url, yt_search_song -from .qrcode_gen import generate_qr +from state import State +from connect import get_connection +from room import Room +from song import Song, init_db, get_song_by_title_artist, add_song_in_db, get_song_by_uuid +from song_fetch import query_search, yt_get_audio_url, yt_search_song +from qrcode_gen import generate_qr dotenv.load_dotenv() @@ -273,4 +273,4 @@ def get_audio_url(): if __name__ == "__main__": - socketio.run(app, debug=True) + socketio.run(app, host="0.0.0.0", port=5000, debug=True) diff --git a/backend/src/room.py b/backend/src/room.py index 5109884..519cabb 100644 --- a/backend/src/room.py +++ b/backend/src/room.py @@ -1,7 +1,7 @@ import random from dataclasses import dataclass -from .song import Song +from song import Song USER_SCORE_WEIGHT = 0.7 ARTIST_WEIGHT = 0.1 diff --git a/backend/src/song.py b/backend/src/song.py index 7409d06..f95609b 100644 --- a/backend/src/song.py +++ b/backend/src/song.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from sqlite3 import Cursor -from .connect import get_connection +from connect import get_connection def init_db(db: Cursor): diff --git a/backend/src/state.py b/backend/src/state.py index e1f3e7c..73d05d2 100644 --- a/backend/src/state.py +++ b/backend/src/state.py @@ -4,7 +4,7 @@ from sqlite3 import Cursor from flask import Flask from flask_socketio import SocketIO -from .room import Room +from room import Room @dataclass From ca0b44122995bbfca5d2e23bb6fa32105554ddb1 Mon Sep 17 00:00:00 2001 From: Leonardo Segala Date: Sat, 2 Aug 2025 08:00:06 +0200 Subject: [PATCH 2/3] Fix color --- frontend/src/lib/components/QueueSlider.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/lib/components/QueueSlider.svelte b/frontend/src/lib/components/QueueSlider.svelte index ec5a647..94430f0 100644 --- a/frontend/src/lib/components/QueueSlider.svelte +++ b/frontend/src/lib/components/QueueSlider.svelte @@ -19,7 +19,7 @@ class={`flex h-[60vw] max-h-[250px] w-[60vw] max-w-[250px] items-center justify-center ${i === 1 ? "spin-slower rounded-full border-2 border-black" : "rounded"} object-cover`} > {#if i === 1} -
+
{/if} Song cover From 78f03dec5daf9c5f238768ba7e08f2c75cd29f13 Mon Sep 17 00:00:00 2001 From: Leonardo Segala Date: Sat, 2 Aug 2025 08:31:31 +0200 Subject: [PATCH 3/3] Minimal aesthetic upgrades --- frontend/src/lib/components/SuggestionList.svelte | 15 ++++++++------- frontend/src/routes/+layout.svelte | 2 +- frontend/src/routes/room/[id]/+page.svelte | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/frontend/src/lib/components/SuggestionList.svelte b/frontend/src/lib/components/SuggestionList.svelte index 285d242..ffc25d6 100644 --- a/frontend/src/lib/components/SuggestionList.svelte +++ b/frontend/src/lib/components/SuggestionList.svelte @@ -1,5 +1,6 @@ -
+
{@render children()}
diff --git a/frontend/src/routes/room/[id]/+page.svelte b/frontend/src/routes/room/[id]/+page.svelte index e53cb58..6237b13 100644 --- a/frontend/src/routes/room/[id]/+page.svelte +++ b/frontend/src/routes/room/[id]/+page.svelte @@ -69,7 +69,7 @@ {#if returnError} {:else} -
+