From 214ae82344f35b5c8cca9e88f9dc4cd634a4c001 Mon Sep 17 00:00:00 2001 From: geoffrey45 Date: Tue, 8 Feb 2022 00:39:08 +0300 Subject: [PATCH] improve nowPlaying alignment --- server/app/api.py | 3 + server/app/functions.py | 4 +- server/app/helpers.py | 14 +-- src/App.vue | 8 +- src/assets/css/BottomBar/BottomBar.scss | 2 +- src/assets/css/global.scss | 12 +++ src/components/AlbumView/Header.vue | 2 +- src/components/BottomBar/SongCard.vue | 2 +- src/components/FolderView/Header.vue | 1 - src/components/FolderView/SongList.vue | 4 +- src/components/PlaylistView/Header.vue | 2 +- src/components/RightSideBar/NowPlaying.vue | 113 +++++++++++++-------- src/components/shared/SongItem.vue | 9 +- src/composables/perks.js | 5 +- src/composables/playAudio.js | 3 +- 15 files changed, 113 insertions(+), 71 deletions(-) diff --git a/server/app/api.py b/server/app/api.py index 6e508cec..8909d3f7 100644 --- a/server/app/api.py +++ b/server/app/api.py @@ -145,6 +145,9 @@ def get_albumartists(album, artist): @bp.route("/populate/images") def populate_images(): + """ + Populates the artist images. + """ functions.populate_images() return "Done" diff --git a/server/app/functions.py b/server/app/functions.py index 24a51665..3457719e 100644 --- a/server/app/functions.py +++ b/server/app/functions.py @@ -54,7 +54,7 @@ def populate(): def fetch_image_path(artist: str) -> str or None: """ - Returns a direct link to an artist artist + Returns a direct link to an artist image. """ try: @@ -66,7 +66,7 @@ def fetch_image_path(artist: str) -> str or None: except requests.exceptions.ConnectionError: time.sleep(5) return None - except IndexError: + except (IndexError, KeyError): return None diff --git a/server/app/helpers.py b/server/app/helpers.py index ea77723f..0a641419 100644 --- a/server/app/helpers.py +++ b/server/app/helpers.py @@ -20,12 +20,14 @@ LAST_FM_API_KEY = "762db7a44a9e6fb5585661f5f2bdf23a" def background(f): - ''' + """ a threading decorator use @background above the function you want to run in the background - ''' + """ + def background_func(*a, **kw): threading.Thread(target=f, args=a, kwargs=kw).start() + return background_func @@ -40,10 +42,9 @@ def check_for_new_songs(): functions.populate() functions.populate_images() time.sleep(300) - -def run_fast_scandir(_dir:str, ext: list): +def run_fast_scandir(_dir: str, ext: list): """ Scans a directory for files with a specific extension. Returns a list of files and folders in the directory. """ @@ -96,7 +97,7 @@ def save_image(url: str, path: str) -> None: img.save(path, 'JPEG') -def isValidFile(filename: str) -> bool: +def is_valid_file(filename: str) -> bool: """ Checks if a file is valid. Returns True if it is, False if it isn't. """ @@ -120,7 +121,7 @@ def create_config_dir() -> None: for _dir in dirs: path = os.path.join(config_folder, _dir) - + try: os.makedirs(path) except FileExistsError: @@ -128,6 +129,7 @@ def create_config_dir() -> None: os.chmod(path, 0o755) + def get_all_songs() -> List: """ Gets all songs under the ~/ directory. diff --git a/src/App.vue b/src/App.vue index da994c72..6a8f63c5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -69,10 +69,8 @@ export default { position: absolute; width: 3rem; height: 100%; - background: url(./assets/icons/menu.svg); background-size: 2rem; - background-repeat: no-repeat; - background-position: center; + background: url(./assets/icons/menu.svg) no-repeat center; cursor: pointer; } } @@ -80,10 +78,8 @@ export default { height: 2rem; width: 9rem; margin-left: 3rem; - background: url(./assets/logo.svg); background-size: contain; - background-repeat: no-repeat; - background-position: center; + background: url(./assets/logo.svg) no-repeat center; } .r-sidebar { diff --git a/src/assets/css/BottomBar/BottomBar.scss b/src/assets/css/BottomBar/BottomBar.scss index 865b7341..f12fb67c 100644 --- a/src/assets/css/BottomBar/BottomBar.scss +++ b/src/assets/css/BottomBar/BottomBar.scss @@ -19,7 +19,7 @@ width: 3rem; height: 3rem; border-radius: $smaller; - background-image: url("../../images/eggs.jpg"); + background-image: url("../../images/null.webp"); } .separator { diff --git a/src/assets/css/global.scss b/src/assets/css/global.scss index 71cfc690..f77525eb 100644 --- a/src/assets/css/global.scss +++ b/src/assets/css/global.scss @@ -154,6 +154,18 @@ button { white-space: nowrap; } +.shadow-sm { + box-shadow: 0rem 0rem .5rem rgb(0, 0, 0); +} + +.shadow-md { + box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.075); +} + +.shadow-lg { + box-shadow: 0 1rem 2rem rgba(0, 0, 0, 0.175); +} + /* scrollbars */ /* width */ diff --git a/src/components/AlbumView/Header.vue b/src/components/AlbumView/Header.vue index 16bbf6a1..7a8cef99 100644 --- a/src/components/AlbumView/Header.vue +++ b/src/components/AlbumView/Header.vue @@ -66,7 +66,7 @@ export default { gap: $small; position: relative; overflow: hidden; - height: 15rem; + height: 14rem; .right { @include tablet-landscape { diff --git a/src/components/BottomBar/SongCard.vue b/src/components/BottomBar/SongCard.vue index 9c867b50..3700c465 100644 --- a/src/components/BottomBar/SongCard.vue +++ b/src/components/BottomBar/SongCard.vue @@ -16,7 +16,7 @@ }}
- {{ track.album_artist }} + {{ track.albumartist }}
diff --git a/src/components/FolderView/Header.vue b/src/components/FolderView/Header.vue index b4415777..f9300a75 100644 --- a/src/components/FolderView/Header.vue +++ b/src/components/FolderView/Header.vue @@ -40,7 +40,6 @@ export default { } watch(query, () => { - console.log(query.value); emit("search", query.value); }); diff --git a/src/components/FolderView/SongList.vue b/src/components/FolderView/SongList.vue index 2839c81a..35dc6c06 100644 --- a/src/components/FolderView/SongList.vue +++ b/src/components/FolderView/SongList.vue @@ -74,8 +74,8 @@ function updateQueue(song) { perks.updateQueue(song, type); } -function loadAlbum(title, album_artist) { - routeLoader.toAlbum(title, album_artist); +function loadAlbum(title, albumartist) { + routeLoader.toAlbum(title, albumartist); } diff --git a/src/components/PlaylistView/Header.vue b/src/components/PlaylistView/Header.vue index 1497cb0d..37a84b54 100644 --- a/src/components/PlaylistView/Header.vue +++ b/src/components/PlaylistView/Header.vue @@ -26,7 +26,7 @@ .p-header { display: grid; grid-template-columns: 1fr; - height: 15rem; + height: 14rem; background-image: url("../../assets/images/eggs.jpg"); position: relative; diff --git a/src/components/RightSideBar/NowPlaying.vue b/src/components/RightSideBar/NowPlaying.vue index b44c9bec..42a8fb2e 100644 --- a/src/components/RightSideBar/NowPlaying.vue +++ b/src/components/RightSideBar/NowPlaying.vue @@ -1,23 +1,29 @@