Compare commits

..

No commits in common. "c9d07f5ef77185b84151dc1cbc867f1333dbbc37" and "dfa44db91fdba0d822bcd312f5ca9dfd0aa8ad55" have entirely different histories.

2 changed files with 4 additions and 11 deletions

View File

@ -15,17 +15,16 @@
from year <b>{{ album_year }}</b> </span><br /> from year <b>{{ album_year }}</b> </span><br />
<b>{{ album_tracks.length }}</b> Tracks with a duration of <b>{{ album_tracks.length }}</b> Tracks with a duration of
<b>{{ album_duration }}</b> <b>{{ album_duration }}</b>
</span> </span>
<div class="grow"> </div> <div class="grow"> </div>
<div class="flex-row grow ma-top"> <div class="flex-row grow ma-top">
<button class="flat ma-right" title="Favourite" @click="toggleFavourite"> <button class="flat ma-right" title="Favourite" @click="toggleFavourite">
<awesome-icon :icon="['fas', 'star']" size="2x" class="white-text favourite active" v-if="isFavourite" /> <awesome-icon :icon="['fas', 'star']" size="2x" class="white-text favourite active" v-if="isFavourite" />
<awesome-icon :icon="['far', 'star']" size="2x" class="white-text favourite" v-else /> <awesome-icon :icon="['far', 'star']" size="2x" class="white-text favourite" v-else />
</button> </button>
<button class="flat ma-right" title="Keep playing" v-if="selectedAlbum._id == selectedTrackContainer._id && isPlaying"> <button class="flat ma-right" title="Keep playing" @click="playProgress" v-if="selectedAlbum.progress">
<awesome-icon icon="compact-disc" size="2x" class="primary-text" />
</button>
<button class="flat ma-right" title="Keep playing" @click="playProgress" v-else-if="selectedAlbum.progress">
<awesome-icon icon="play" size="2x" class="primary-text" /> <awesome-icon icon="play" size="2x" class="primary-text" />
</button> </button>
<button class="flat ma-right" title="Play" @click="playAlbum" v-else> <button class="flat ma-right" title="Play" @click="playAlbum" v-else>
@ -246,9 +245,7 @@ export default {
nextAlbum: ["albums/nextAlbum"], nextAlbum: ["albums/nextAlbum"],
selectedAlbum: ["albums/selectedAlbum"], selectedAlbum: ["albums/selectedAlbum"],
selectedTrack: ["tracks/selectedTrack"], selectedTrack: ["tracks/selectedTrack"],
selectedTrackContainer: ["tracks/selectedTrackContainer"],
favourites: ["user/favourites"], favourites: ["user/favourites"],
isPlaying: ["player/isPlaying"],
}), }),
album_title() { album_title() {
return this.selectedAlbum.title; return this.selectedAlbum.title;

View File

@ -17,10 +17,7 @@
<awesome-icon :icon="['fas', 'star']" size="2x" class="white-text favourite active" v-if="isFavourite" /> <awesome-icon :icon="['fas', 'star']" size="2x" class="white-text favourite active" v-if="isFavourite" />
<awesome-icon :icon="['far', 'star']" size="2x" class="white-text favourite" v-else /> <awesome-icon :icon="['far', 'star']" size="2x" class="white-text favourite" v-else />
</button> </button>
<button class="flat ma-right" title="Keep playing" v-if="selectedArtist._id == selectedTrackContainer._id && isPlaying"> <button class="flat ma-right" @click="playProgress" title="Keep playing" v-if="selectedArtist.progress">
<awesome-icon icon="compact-disc" size="2x" class="primary-text" />
</button>
<button class="flat ma-right" @click="playProgress" title="Keep playing" v-else-if="selectedArtist.progress">
<awesome-icon icon="play" size="2x" class="primary-text" /> <awesome-icon icon="play" size="2x" class="primary-text" />
</button> </button>
<button class="flat ma-right" @click="playArtist" title="Play" v-else> <button class="flat ma-right" @click="playArtist" title="Play" v-else>
@ -179,7 +176,6 @@ export default {
nextArtist: ["artists/nextArtist"], nextArtist: ["artists/nextArtist"],
selectedArtist: ["artists/selectedArtist"], selectedArtist: ["artists/selectedArtist"],
selectedTrack: ["tracks/selectedTrack"], selectedTrack: ["tracks/selectedTrack"],
selectedTrackContainer: ["tracks/selectedTrackContainer"],
favourites: ["user/favourites"], favourites: ["user/favourites"],
isPlaying: ["player/isPlaying"] isPlaying: ["player/isPlaying"]
}), }),