diff --git a/server/app/albumslib.py b/server/app/albumslib.py index 817d113..09775b3 100644 --- a/server/app/albumslib.py +++ b/server/app/albumslib.py @@ -51,14 +51,19 @@ def find_album(albumtitle, artist): return album -def search_albums_by_name(query): +def search_albums_by_name(query: str) -> List[models.Album]: """ Searches albums by album name. """ - albums: List[models.Album] = [] + title_albums: List[models.Album] = [] + artist_albums: List[models.Album] = [] for album in ALBUMS: - if query in album.album: - albums.append(album) + if query.lower() in album.album.lower(): + title_albums.append(album) - return albums + for album in ALBUMS: + if query.lower() in album.artist.lower(): + artist_albums.append(album) + + return [*title_albums, *artist_albums] diff --git a/server/app/prep.py b/server/app/prep.py index ffea013..daf1477 100644 --- a/server/app/prep.py +++ b/server/app/prep.py @@ -1,3 +1,8 @@ +""" +Contains the functions to prepare the server for use. +""" + + import os from app import settings diff --git a/src/assets/icons/folder.fill.svg b/src/assets/icons/folder.fill.svg new file mode 100644 index 0000000..e37dc4c --- /dev/null +++ b/src/assets/icons/folder.fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/logo.svg b/src/assets/icons/logo.svg index f57556b..f8d66ed 100644 --- a/src/assets/icons/logo.svg +++ b/src/assets/icons/logo.svg @@ -1,9 +1,7 @@ - - - - + + @@ -14,5 +12,9 @@ + + + + diff --git a/src/components/FolderView/Header.vue b/src/components/FolderView/Header.vue index d9a452c..c8f3138 100644 --- a/src/components/FolderView/Header.vue +++ b/src/components/FolderView/Header.vue @@ -124,7 +124,7 @@ export default { left: $small; height: 1.5rem; width: 1.5rem; - background-image: url(../../assets/icons/folder.svg); + background-image: url(../../assets/icons/folder.fill.svg); margin-right: $small; } diff --git a/src/components/nav/NavBar.vue b/src/components/nav/NavBar.vue index e1977de..fceaf1b 100644 --- a/src/components/nav/NavBar.vue +++ b/src/components/nav/NavBar.vue @@ -1,11 +1,11 @@