-
-
diff --git a/src/library/TrackContextMenu.vue b/src/library/TrackContextMenu.vue
index 71132aa..40177c3 100644
--- a/src/library/TrackContextMenu.vue
+++ b/src/library/TrackContextMenu.vue
@@ -1,7 +1,7 @@
{{ section.name }}
-
- {{ item.artist }}
-
-
+ {{ item.artist }}
+
+
-
@@ -26,23 +27,23 @@
}
diff --git a/src/library/album/AlbumLibrary.vue b/src/library/album/AlbumLibrary.vue
index 59dc960..8ee5e0e 100644
--- a/src/library/album/AlbumLibrary.vue
+++ b/src/library/album/AlbumLibrary.vue
@@ -1,50 +1,47 @@
{{ album.name }}
-by +
+ by
-
-
-
+
diff --git a/src/library/album/AlbumList.vue b/src/library/album/AlbumList.vue
index d382a4a..d64e4d1 100644
--- a/src/library/album/AlbumList.vue
+++ b/src/library/album/AlbumList.vue
@@ -1,9 +1,9 @@
Albums
-+ Albums +
+Similar artists
-+ Similar artists +
+{{ item.name }}
-
-
@@ -26,13 +26,13 @@
-
-
-
@@ -18,11 +18,11 @@
diff --git a/src/player/store.ts b/src/player/store.ts
index e1d430c..797c5bf 100644
--- a/src/player/store.ts
+++ b/src/player/store.ts
@@ -1,12 +1,12 @@
import { Store, Module } from 'vuex'
-const audio = new Audio();
-const storedQueue = JSON.parse(localStorage.getItem("queue") || "[]");
-const storedQueueIndex = parseInt(localStorage.getItem("queueIndex") || "-1");
+const audio = new Audio()
+const storedQueue = JSON.parse(localStorage.getItem('queue') || '[]')
+const storedQueueIndex = parseInt(localStorage.getItem('queueIndex') || '-1')
if (storedQueueIndex > -1 && storedQueueIndex < storedQueue.length) {
- audio.src = storedQueue[storedQueueIndex].url;
+ audio.src = storedQueue[storedQueueIndex].url
}
-const mediaSession: MediaSession | undefined = navigator.mediaSession;
+const mediaSession: MediaSession | undefined = navigator.mediaSession
interface State {
queue: any[];
@@ -28,177 +28,176 @@ export const playerModule: Module = {
mutations: {
setPlaying(state) {
- state.isPlaying = true;
+ state.isPlaying = true
if (mediaSession) {
- mediaSession.playbackState = "playing";
+ mediaSession.playbackState = 'playing'
}
},
setPaused(state) {
- state.isPlaying = false;
+ state.isPlaying = false
if (mediaSession) {
- mediaSession.playbackState = "paused";
+ mediaSession.playbackState = 'paused'
}
},
setPosition(state, time: number) {
- audio.currentTime = time;
+ audio.currentTime = time
},
setQueue(state, queue) {
- state.queue = queue;
- state.queueIndex = -1;
- localStorage.setItem("queue", JSON.stringify(queue));
+ state.queue = queue
+ state.queueIndex = -1
+ localStorage.setItem('queue', JSON.stringify(queue))
},
setQueueIndex(state, index) {
if (state.queue.length === 0) {
- return;
+ return
}
- index = Math.max(0, index);
- index = index < state.queue.length ? index : 0;
- state.queueIndex = index;
- localStorage.setItem("queueIndex", index);
- const track = state.queue[index];
- audio.src = track.url;
+ index = Math.max(0, index)
+ index = index < state.queue.length ? index : 0
+ state.queueIndex = index
+ localStorage.setItem('queueIndex', index)
+ const track = state.queue[index]
+ audio.src = track.url
if (mediaSession) {
mediaSession.metadata = new MediaMetadata({
title: track.title,
artist: track.artist,
album: track.album,
- artwork: track.image ? [{ src: track.image, sizes: "300x300" }] : undefined,
- });
+ artwork: track.image ? [{ src: track.image, sizes: '300x300' }] : undefined,
+ })
}
},
addToQueue(state, track) {
- state.queue.push(track);
+ state.queue.push(track)
},
removeFromQueue(state, index) {
- state.queue.splice(index, 1);
+ state.queue.splice(index, 1)
if (index < state.queueIndex) {
- state.queueIndex--;
+ state.queueIndex--
}
},
setNextInQueue(state, track) {
- state.queue.splice(state.queueIndex + 1, 0, track);
+ state.queue.splice(state.queueIndex + 1, 0, track)
},
setProgress(state, value: any) {
- state.currentTime = value;
+ state.currentTime = value
},
setDuration(state, value: any) {
- state.duration = value;
+ state.duration = value
},
},
actions: {
async playQueue({ commit }, { queue, index }) {
- commit("setQueue", [...queue]);
- commit("setQueueIndex", index);
- commit("setPlaying");
- await audio.play();
+ commit('setQueue', [...queue])
+ commit('setQueueIndex', index)
+ commit('setPlaying')
+ await audio.play()
},
async play({ commit }) {
- commit("setPlaying");
- await audio.play();
+ commit('setPlaying')
+ await audio.play()
},
pause({ commit }) {
- audio.pause();
- commit("setPaused");
+ audio.pause()
+ commit('setPaused')
},
async next({ commit, state }) {
- commit("setQueueIndex", state.queueIndex + 1);
- commit("setPlaying");
- await audio.play();
+ commit('setQueueIndex', state.queueIndex + 1)
+ commit('setPlaying')
+ await audio.play()
},
async previous({ commit, state }) {
- commit("setQueueIndex", state.queueIndex - 1);
- commit("setPlaying");
- await audio.play();
+ commit('setQueueIndex', state.queueIndex - 1)
+ commit('setPlaying')
+ await audio.play()
},
playPause({ state, dispatch }) {
if (state.isPlaying) {
- return dispatch("pause");
+ return dispatch('pause')
}
- return dispatch("play");
+ return dispatch('play')
},
seek({ commit, state }, value) {
- commit("setPosition", state.duration * value);
+ commit('setPosition', state.duration * value)
},
playNext({ commit }, track) {
- commit("setNextInQueue", track);
+ commit('setNextInQueue', track)
},
addToQueue({ commit }, track) {
- commit("addToQueue", track);
+ commit('addToQueue', track)
},
},
-
+
getters: {
track(state) {
- if (state.queueIndex != -1) {
- return state.queue[state.queueIndex];
+ if (state.queueIndex !== -1) {
+ return state.queue[state.queueIndex]
}
- return null;
+ return null
},
trackId(state, getters): number {
- return getters.track ? getters.track.id : -1;
+ return getters.track ? getters.track.id : -1
},
progress(state) {
if (state.currentTime > -1 && state.duration > 0) {
- return (state.currentTime / state.duration) * 100;
+ return (state.currentTime / state.duration) * 100
}
- return 0;
+ return 0
},
hasNext(state) {
- return state.queueIndex < state.queue.length - 1;
+ return state.queueIndex < state.queue.length - 1
},
hasPrevious(state) {
- return state.queueIndex > 0;
+ return state.queueIndex > 0
},
},
-};
-
+}
export function setupAudio(store: Store) {
- audio.ontimeupdate = (event) => {
- store.commit("player/setProgress", audio.currentTime)
- };
- audio.ondurationchange = (event) => {
- store.commit("player/setDuration", audio.duration);
+ audio.ontimeupdate = () => {
+ store.commit('player/setProgress', audio.currentTime)
}
- audio.onended = (event) => {
- store.dispatch("player/next");
+ audio.ondurationchange = () => {
+ store.commit('player/setDuration', audio.duration)
}
- audio.onerror = (event) => {
- store.commit("player/setPaused");
- store.commit("setError", audio.error);
+ audio.onended = () => {
+ store.dispatch('player/next')
+ }
+ audio.onerror = () => {
+ store.commit('player/setPaused')
+ store.commit('setError', audio.error)
+ }
+ audio.onwaiting = () => {
+ console.log('audio is waiting for more data.')
}
- audio.onwaiting = (event) => {
- console.log('audio is waiting for more data.');
- };
if (mediaSession) {
mediaSession.setActionHandler('play', () => {
- store.dispatch("player/play");
- });
+ store.dispatch('player/play')
+ })
mediaSession.setActionHandler('pause', () => {
- store.dispatch("player/pause");
- });
+ store.dispatch('player/pause')
+ })
mediaSession.setActionHandler('nexttrack', () => {
- store.dispatch("player/next");
- });
+ store.dispatch('player/next')
+ })
mediaSession.setActionHandler('previoustrack', () => {
- store.dispatch("player/previous");
- });
+ store.dispatch('player/previous')
+ })
mediaSession.setActionHandler('stop', () => {
- store.dispatch("player/pause");
- });
- mediaSession.setActionHandler("seekto", (details) => {
- store.commit("player/setPosition", details.seekTime);
- });
- mediaSession.setActionHandler("seekforward", (details) => {
- const offset = details.seekOffset || 10;
- store.commit("player/setPosition", Math.min(audio.currentTime + offset, audio.duration));
- });
- mediaSession.setActionHandler("seekbackward", (details) => {
- const offset = details.seekOffset || 10;
- store.commit("player/setPosition", Math.max(audio.currentTime - offset, 0));
- });
+ store.dispatch('player/pause')
+ })
+ mediaSession.setActionHandler('seekto', (details) => {
+ store.commit('player/setPosition', details.seekTime)
+ })
+ mediaSession.setActionHandler('seekforward', (details) => {
+ const offset = details.seekOffset || 10
+ store.commit('player/setPosition', Math.min(audio.currentTime + offset, audio.duration))
+ })
+ mediaSession.setActionHandler('seekbackward', (details) => {
+ const offset = details.seekOffset || 10
+ store.commit('player/setPosition', Math.max(audio.currentTime - offset, 0))
+ })
// FIXME
// function updatePositionState() {
// if (mediaSession && mediaSession.setPositionState) {
diff --git a/src/playlist/Playlist.vue b/src/playlist/Playlist.vue
index 9da190d..0588d35 100644
--- a/src/playlist/Playlist.vue
+++ b/src/playlist/Playlist.vue
@@ -1,9 +1,9 @@
-
+
-
+
Delete playlist
@@ -18,43 +18,42 @@
diff --git a/src/playlist/PlaylistList.vue b/src/playlist/PlaylistList.vue
index dff60a4..e043d2d 100644
--- a/src/playlist/PlaylistList.vue
+++ b/src/playlist/PlaylistList.vue
@@ -1,9 +1,9 @@
+ :image="item.image"
+ :to="{name: 'playlist', params: { id: item.id } }"
+ :title="item.name">
{{ item.songCount }} songs
@@ -11,13 +11,13 @@
diff --git a/src/playlist/PlaylistNav.vue b/src/playlist/PlaylistNav.vue
index 421984a..5cfeb34 100644
--- a/src/playlist/PlaylistNav.vue
+++ b/src/playlist/PlaylistNav.vue
@@ -3,21 +3,21 @@
-
+ :to="{name: 'playlist', params: { id: item.id }}"
+ class="nav-item nav-link">
-
@@ -27,47 +27,48 @@
-
- Create
+
+ Create
+
diff --git a/src/playlist/RandomSongs.vue b/src/playlist/RandomSongs.vue
index 73be97c..d2ad4d0 100644
--- a/src/playlist/RandomSongs.vue
+++ b/src/playlist/RandomSongs.vue
@@ -1,14 +1,13 @@
@@ -50,39 +50,39 @@
}
diff --git a/src/player/Queue.vue b/src/player/Queue.vue
index 5f8b77f..22dd62d 100644
--- a/src/player/Queue.vue
+++ b/src/player/Queue.vue
@@ -10,23 +10,23 @@
diff --git a/src/player/TrackInfo.vue b/src/player/TrackInfo.vue
index cd10557..06f856b 100644
--- a/src/player/TrackInfo.vue
+++ b/src/player/TrackInfo.vue
@@ -1,9 +1,9 @@
-
{{ track.name }}
-{{ track.artist }}
- {{ track.name }}
+{{ track.artist }}
+ {{ data.name }}
-
-
-
+
|
- |
{{ item.artist }} | {{ item.album }} | @@ -19,24 +18,24 @@ diff --git a/src/search/SearchForm.vue b/src/search/SearchForm.vue index e1007de..dff1968 100644 --- a/src/search/SearchForm.vue +++ b/src/search/SearchForm.vue @@ -2,25 +2,25 @@