diff --git a/backend/src/app.py b/backend/src/app.py index 559baf1..436d5d7 100644 --- a/backend/src/app.py +++ b/backend/src/app.py @@ -1,18 +1,17 @@ import uuid from dataclasses import asdict + import dotenv +from connect import get_connection 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 gps import Coordinates, distance_between_coords from qrcode_gen import generate_qr -from gps import is_within_range, distance_between_coords, Coordinates - +from room import Room +from song import Song, add_song_in_db, get_song_by_title_artist, get_song_by_uuid, init_db +from song_fetch import query_search, yt_get_audio_url, yt_search_song +from state import State dotenv.load_dotenv() @@ -33,7 +32,7 @@ state.rooms[1000] = Room( name="Test Room", pin=None, tags=set(), - range_size=100, + range_size=150, songs={}, history=[], playing=[], diff --git a/frontend/src/app.html b/frontend/src/app.html index 7af2f6d..344c77b 100644 --- a/frontend/src/app.html +++ b/frontend/src/app.html @@ -1,15 +1,13 @@ + + + + + %sveltekit.head% + - - - - - %sveltekit.head% - - - -
%sveltekit.body%
- - + +
%sveltekit.body%
+ diff --git a/frontend/src/lib/components/RoomComponent.svelte b/frontend/src/lib/components/RoomComponent.svelte index e98e000..4e742db 100644 --- a/frontend/src/lib/components/RoomComponent.svelte +++ b/frontend/src/lib/components/RoomComponent.svelte @@ -3,8 +3,9 @@ let { room }: { room: Room } = $props() - + diff --git a/frontend/src/lib/components/SuggestionInput.svelte b/frontend/src/lib/components/SuggestionInput.svelte index 91053d0..4e28cb7 100644 --- a/frontend/src/lib/components/SuggestionInput.svelte +++ b/frontend/src/lib/components/SuggestionInput.svelte @@ -1,8 +1,9 @@
@@ -21,37 +33,8 @@
- - - - - - - - - - - - + {#each rooms as room} + + {/each}
- - - - - - - - - - - - - - - - - - - - diff --git a/frontend/static/favicon.ico b/frontend/static/favicon.ico new file mode 100644 index 0000000..f5208bb Binary files /dev/null and b/frontend/static/favicon.ico differ diff --git a/frontend/static/favicon.svg b/frontend/static/favicon.svg deleted file mode 100644 index cc5dc66..0000000 --- a/frontend/static/favicon.svg +++ /dev/null @@ -1 +0,0 @@ -svelte-logo \ No newline at end of file