diff --git a/src/assets/icons/heart.fill.svg b/src/assets/icons/heart.fill.svg index 5e260149..638cb3eb 100644 --- a/src/assets/icons/heart.fill.svg +++ b/src/assets/icons/heart.fill.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/assets/icons/playlist-1.svg b/src/assets/icons/playlist-1.svg index 5453cb0d..723ba82f 100644 --- a/src/assets/icons/playlist-1.svg +++ b/src/assets/icons/playlist-1.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/ArtistView/Header.vue b/src/components/ArtistView/Header.vue index 79b30572..d4fdf475 100644 --- a/src/components/ArtistView/Header.vue +++ b/src/components/ArtistView/Header.vue @@ -16,7 +16,7 @@ }" >
-
ARTIST
+
Artist
{{ artist.info.name }}
{{ artist.info.trackcount }} Track{{ diff --git a/src/components/LeftSidebar/Navigation.vue b/src/components/LeftSidebar/Navigation.vue index 3808b27b..75a47d1e 100644 --- a/src/components/LeftSidebar/Navigation.vue +++ b/src/components/LeftSidebar/Navigation.vue @@ -76,8 +76,6 @@ const menus = [ .side-nav-container { text-transform: capitalize; margin-top: 1rem; - // background-color: rgba(255, 255, 255, 0.075); - // padding: $small; .nav-button { border-radius: $medium; diff --git a/src/components/LeftSidebar/Playlists.vue b/src/components/LeftSidebar/Playlists.vue deleted file mode 100644 index 6e341751..00000000 --- a/src/components/LeftSidebar/Playlists.vue +++ /dev/null @@ -1,53 +0,0 @@ - - - - - diff --git a/src/components/shared/SongItem.vue b/src/components/shared/SongItem.vue index d842d29c..ba6994ab 100644 --- a/src/components/shared/SongItem.vue +++ b/src/components/shared/SongItem.vue @@ -226,6 +226,7 @@ async function addToFav(trackhash: string) { align-content: center; transition: all 0.2s; transform: translateX(-1.5rem); + color: red; } } diff --git a/src/config.ts b/src/config.ts index 39fc4571..051c90b2 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,17 +1,13 @@ -// "local" | "remote" -let mode = "local"; +// "dev" | "prod" +let mode = "dev"; export interface D { [key: string]: T; } const domains: D = { - local: "http://localhost:", - remote: "http://192.168.100.25:", -}; - -const ports = { - api: 1970, + dev: "http://localhost:1970", + prod: "", }; const imageRoutes = { @@ -28,14 +24,13 @@ const imageRoutes = { }; function toggleMode() { - mode = mode === "local" ? "remote" : "local"; + mode = mode === "dev" ? "prod" : "dev"; } const domain = () => domains[mode]; -const baseImgUrl = domain() + ports.api + "/img"; - -const baseApiUrl = domain() + ports.api; +const baseApiUrl = domain(); +const baseImgUrl = baseApiUrl + "/img"; const paths = { api: { diff --git a/src/contexts/track_context.ts b/src/contexts/track_context.ts index bd78045c..21263223 100644 --- a/src/contexts/track_context.ts +++ b/src/contexts/track_context.ts @@ -1,16 +1,17 @@ -import { Playlist, Track } from "../interfaces"; +import { Artist, Playlist, Track } from "../interfaces"; // @ts-ignore import { Option } from "../interfaces"; import Router from "../router"; import { - addTrackToPlaylist, - getAllPlaylists + addTrackToPlaylist, + getAllPlaylists, } from "../composables/fetch/playlists"; import useModalStore from "../stores/modal"; import useQueueStore from "../stores/queue"; +import { Routes } from "@/router/routes"; /** * Returns a list of context menu items for a track. * @param {any} track a track object. @@ -28,6 +29,7 @@ export default async ( }; const single_artist = track.artist.length === 1; + const single_album_artist = track.albumartist.length === 1; let playlists = []; const p = await getAllPlaylists(); @@ -41,15 +43,21 @@ export default async ( }; }); - const goToArtist = () => { - if (single_artist) { + const goToArtist = (artists: Artist[]) => { + if (artists.length === 1) { return false; } - return track.artist.map((artist) => { + return artists.map((artist) => { return