diff --git a/src/components/music_player/music_player.js b/src/components/music_player/music_player.js index f4b003dd..37564954 100644 --- a/src/components/music_player/music_player.js +++ b/src/components/music_player/music_player.js @@ -41,6 +41,12 @@ const musicPlayer = { }, defaultVolume () { return this.$store.getters.mergedConfig.defaultProfileMusicVolume + }, + currentTime() { + const currentTime = Math.floor(this.progress * this.songDuration / 100) + const minutes = Math.floor(currentTime / 60) + const seconds = currentTime - minutes * 60 + return `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}` } }, methods: { @@ -73,23 +79,23 @@ const musicPlayer = { clearQueue () { this.$store.dispatch('setBackgroundMusic', null) this.togglePanel() - }, - created () { - this.progress = 0 - this.volume = this.defaultVolume - setInterval(() => { - if (this.$store.getters.hasSong) { - this.progress = this.$store.getters.songProgress - if (this.progress === 100) { - this.$store.dispatch('playlistNext') - } - } - }, 1000) - }, - beforeDestroy () { - clearInterval() } + }, + created () { + this.progress = 0 + this.volume = this.defaultVolume + setInterval(() => { + if (this.$store.getters.hasSong) { + this.progress = this.$store.getters.songProgress + if (this.progress === 100) { + this.$store.dispatch('playlistNext') + } + } + }, 1000) + }, + beforeDestroy () { + clearInterval() } } -export default musicPlayer \ No newline at end of file +export default musicPlayer diff --git a/src/components/music_player/music_player.vue b/src/components/music_player/music_player.vue index d7dea6b1..a4cfe176 100644 --- a/src/components/music_player/music_player.vue +++ b/src/components/music_player/music_player.vue @@ -19,6 +19,16 @@
+
+ +
-
+ +
+
+
+
+
+
-
-
-
-
+
+
@@ -158,16 +167,25 @@ column-gap: 1em; .music-player-controls { - display: inline-flex; column-gap: 1em; + display: flex; + justify-content: center; + align-items: center; .music-player-button { display: inline-flex; column-gap: 2em; } } + .music-player-volume { + display: inline-flex; + column-gap: 1em; + padding-top: 1em; + } + + .music-player-timeline { - padding-top: 1em; + padding-bottom: 1em; .seekbar { width: 100% }