[web-src] Refactor spotify modal dialogs into a separate components

web-src/src/pages/SpotifyPageAlbum.vue

@@ -11,7 +11,14 @@
     </template>
     <template slot="content">
       <p class="heading has-text-centered-mobile">{{ album.tracks.total }} tracks</p>
-      <spotify-list-item-track v-for="(track, index) in album.tracks.items" :key="track.id" :track="track" :position="index" :album="album" :context_uri="album.uri"></spotify-list-item-track>
+      <spotify-list-item-track v-for="(track, index) in album.tracks.items" :key="track.id" :track="track" :position="index" :album="album" :context_uri="album.uri">
+        <template slot="actions">
+          <a @click="open_track_dialog(track)">
+            <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
+          </a>
+        </template>
+      </spotify-list-item-track>
+      <spotify-modal-dialog-track :show="show_track_details_modal" :track="selected_track" :album="album" @close="show_track_details_modal = false" />
     </template>
   </content-with-heading>
 </template>
@@ -20,6 +27,7 @@
 import { LoadDataBeforeEnterMixin } from './mixin'
 import ContentWithHeading from '@/templates/ContentWithHeading'
 import SpotifyListItemTrack from '@/components/SpotifyListItemTrack'
+import SpotifyModalDialogTrack from '@/components/SpotifyModalDialogTrack'
 import store from '@/store'
 import webapi from '@/webapi'
 import SpotifyWebApi from 'spotify-web-api-js'
@@ -39,11 +47,14 @@ const albumData = {
 export default {
   name: 'PageAlbum',
   mixins: [ LoadDataBeforeEnterMixin(albumData) ],
-  components: { ContentWithHeading, SpotifyListItemTrack },
+  components: { ContentWithHeading, SpotifyListItemTrack, SpotifyModalDialogTrack },
 
   data () {
     return {
-      album: {}
+      album: { artists: [{}], tracks: {} },
+
+      show_track_details_modal: false,
+      selected_track: {}
     }
   },
 
@@ -55,6 +66,11 @@ export default {
     play: function () {
       this.show_details_modal = false
       webapi.player_play_uri(this.album.uri, true)
+    },
+
+    open_track_dialog: function (track) {
+      this.selected_track = track
+      this.show_track_details_modal = true
     }
   }
 }

web-src/src/pages/SpotifyPageArtist.vue

@@ -5,8 +5,15 @@
     </template>
     <template slot="content">
       <p class="heading has-text-centered-mobile">{{ total }} albums</p>
-      <spotify-list-item-album v-for="album in albums" :key="album.id" :album="album"></spotify-list-item-album>
+      <spotify-list-item-album v-for="album in albums" :key="album.id" :album="album">
+        <template slot="actions">
+          <a @click="open_dialog(album)">
+            <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
+          </a>
+        </template>
+      </spotify-list-item-album>
       <infinite-loading v-if="offset < total" @infinite="load_next"><span slot="no-more">.</span></infinite-loading>
+      <spotify-modal-dialog-album :show="show_details_modal" :album="selected_album" @close="show_details_modal = false" />
     </template>
   </content-with-heading>
 </template>
@@ -15,6 +22,7 @@
 import { LoadDataBeforeEnterMixin } from './mixin'
 import ContentWithHeading from '@/templates/ContentWithHeading'
 import SpotifyListItemAlbum from '@/components/SpotifyListItemAlbum'
+import SpotifyModalDialogAlbum from '@/components/SpotifyModalDialogAlbum'
 import store from '@/store'
 import SpotifyWebApi from 'spotify-web-api-js'
 import InfiniteLoading from 'vue-infinite-loading'
@@ -42,14 +50,17 @@ const artistData = {
 export default {
   name: 'SpotifyPageArtist',
   mixins: [ LoadDataBeforeEnterMixin(artistData) ],
-  components: { ContentWithHeading, SpotifyListItemAlbum, InfiniteLoading },
+  components: { ContentWithHeading, SpotifyListItemAlbum, SpotifyModalDialogAlbum, InfiniteLoading },
 
   data () {
     return {
       artist: {},
       albums: [],
       total: 0,
-      offset: 0
+      offset: 0,
+
+      show_details_modal: false,
+      selected_album: {}
     }
   },
 
@@ -73,6 +84,11 @@ export default {
           $state.complete()
         }
       }
+    },
+
+    open_dialog: function (album) {
+      this.selected_album = album
+      this.show_details_modal = true
     }
   }
 }

web-src/src/pages/SpotifyPageBrowse.vue

@@ -8,7 +8,14 @@
         <p class="title is-4">New Releases</p>
       </template>
       <template slot="content">
-        <spotify-list-item-album v-for="album in new_releases" :key="album.id" :album="album"></spotify-list-item-album>
+        <spotify-list-item-album v-for="album in new_releases" :key="album.id" :album="album">
+          <template slot="actions">
+            <a @click="open_album_dialog(album)">
+              <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
+            </a>
+          </template>
+        </spotify-list-item-album>
+        <spotify-modal-dialog-album :show="show_album_details_modal" :album="selected_album" @close="show_album_details_modal = false" />
       </template>
       <template slot="footer">
         <nav class="level">
@@ -27,7 +34,14 @@
         <p class="title is-4">Featured Playlists</p>
       </template>
       <template slot="content">
-        <spotify-list-item-playlist v-for="playlist in featured_playlists" :key="playlist.id" :playlist="playlist"></spotify-list-item-playlist>
+        <spotify-list-item-playlist v-for="playlist in featured_playlists" :key="playlist.id" :playlist="playlist">
+          <template slot="actions">
+            <a @click="open_playlist_dialog(playlist)">
+              <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
+            </a>
+          </template>
+        </spotify-list-item-playlist>
+        <spotify-modal-dialog-playlist :show="show_playlist_details_modal" :playlist="selected_playlist" @close="show_playlist_details_modal = false" />
       </template>
       <template slot="footer">
         <nav class="level">
@@ -48,6 +62,8 @@ import ContentWithHeading from '@/templates/ContentWithHeading'
 import TabsMusic from '@/components/TabsMusic'
 import SpotifyListItemAlbum from '@/components/SpotifyListItemAlbum'
 import SpotifyListItemPlaylist from '@/components/SpotifyListItemPlaylist'
+import SpotifyModalDialogAlbum from '@/components/SpotifyModalDialogAlbum'
+import SpotifyModalDialogPlaylist from '@/components/SpotifyModalDialogPlaylist'
 import store from '@/store'
 import * as types from '@/store/mutation_types'
 import SpotifyWebApi from 'spotify-web-api-js'
@@ -77,7 +93,17 @@ const browseData = {
 export default {
   name: 'SpotifyPageBrowse',
   mixins: [ LoadDataBeforeEnterMixin(browseData) ],
-  components: { ContentWithHeading, TabsMusic, SpotifyListItemAlbum, SpotifyListItemPlaylist },
+  components: { ContentWithHeading, TabsMusic, SpotifyListItemAlbum, SpotifyListItemPlaylist, SpotifyModalDialogAlbum, SpotifyModalDialogPlaylist },
+
+  data () {
+    return {
+      show_album_details_modal: false,
+      selected_album: {},
+
+      show_playlist_details_modal: false,
+      selected_playlist: {}
+    }
+  },
 
   computed: {
     new_releases () {
@@ -87,6 +113,18 @@ export default {
     featured_playlists () {
       return this.$store.state.spotify_featured_playlists.slice(0, 3)
     }
+  },
+
+  methods: {
+    open_album_dialog: function (album) {
+      this.selected_album = album
+      this.show_album_details_modal = true
+    },
+
+    open_playlist_dialog: function (playlist) {
+      this.selected_playlist = playlist
+      this.show_playlist_details_modal = true
+    }
   }
 }
 </script>

web-src/src/pages/SpotifyPageBrowseFeaturedPlaylists.vue

@@ -7,7 +7,14 @@
         <p class="title is-4">Featured Playlists</p>
       </template>
       <template slot="content">
-        <spotify-list-item-playlist v-for="playlist in featured_playlists" :key="playlist.id" :playlist="playlist"></spotify-list-item-playlist>
+        <spotify-list-item-playlist v-for="playlist in featured_playlists" :key="playlist.id" :playlist="playlist">
+          <template slot="actions">
+            <a @click="open_playlist_dialog(playlist)">
+              <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
+            </a>
+          </template>
+        </spotify-list-item-playlist>
+        <spotify-modal-dialog-playlist :show="show_playlist_details_modal" :playlist="selected_playlist" @close="show_playlist_details_modal = false" />
       </template>
     </content-with-heading>
   </div>
@@ -18,6 +25,7 @@ import { LoadDataBeforeEnterMixin } from './mixin'
 import ContentWithHeading from '@/templates/ContentWithHeading'
 import TabsMusic from '@/components/TabsMusic'
 import SpotifyListItemPlaylist from '@/components/SpotifyListItemPlaylist'
+import SpotifyModalDialogPlaylist from '@/components/SpotifyModalDialogPlaylist'
 import store from '@/store'
 import * as types from '@/store/mutation_types'
 import SpotifyWebApi from 'spotify-web-api-js'
@@ -43,12 +51,26 @@ const browseData = {
 export default {
   name: 'SpotifyPageBrowseFeaturedPlaylists',
   mixins: [ LoadDataBeforeEnterMixin(browseData) ],
-  components: { ContentWithHeading, TabsMusic, SpotifyListItemPlaylist },
+  components: { ContentWithHeading, TabsMusic, SpotifyListItemPlaylist, SpotifyModalDialogPlaylist },
+
+  data () {
+    return {
+      show_playlist_details_modal: false,
+      selected_playlist: {}
+    }
+  },
 
   computed: {
     featured_playlists () {
       return this.$store.state.spotify_featured_playlists
     }
+  },
+
+  methods: {
+    open_playlist_dialog: function (playlist) {
+      this.selected_playlist = playlist
+      this.show_playlist_details_modal = true
+    }
   }
 }
 </script>

web-src/src/pages/SpotifyPageBrowseNewReleases.vue

@@ -7,7 +7,14 @@
         <p class="title is-4">New Releases</p>
       </template>
       <template slot="content">
-        <spotify-list-item-album v-for="album in new_releases" :key="album.id" :album="album"></spotify-list-item-album>
+        <spotify-list-item-album v-for="album in new_releases" :key="album.id" :album="album">
+          <template slot="actions">
+            <a @click="open_album(album)">
+              <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
+            </a>
+          </template>
+        </spotify-list-item-album>
+        <spotify-modal-dialog-album :show="show_album_details_modal" :album="selected_album" @close="show_album_details_modal = false" />
       </template>
     </content-with-heading>
   </div>
@@ -18,6 +25,7 @@ import { LoadDataBeforeEnterMixin } from './mixin'
 import ContentWithHeading from '@/templates/ContentWithHeading'
 import TabsMusic from '@/components/TabsMusic'
 import SpotifyListItemAlbum from '@/components/SpotifyListItemAlbum'
+import SpotifyModalDialogAlbum from '@/components/SpotifyModalDialogAlbum'
 import store from '@/store'
 import * as types from '@/store/mutation_types'
 import SpotifyWebApi from 'spotify-web-api-js'
@@ -43,12 +51,26 @@ const browseData = {
 export default {
   name: 'SpotifyPageBrowseNewReleases',
   mixins: [ LoadDataBeforeEnterMixin(browseData) ],
-  components: { ContentWithHeading, TabsMusic, SpotifyListItemAlbum },
+  components: { ContentWithHeading, TabsMusic, SpotifyListItemAlbum, SpotifyModalDialogAlbum },
+
+  data () {
+    return {
+      show_album_details_modal: false,
+      selected_album: {}
+    }
+  },
 
   computed: {
     new_releases () {
       return this.$store.state.spotify_new_releases
     }
+  },
+
+  methods: {
+    open_album: function (album) {
+      this.selected_album = album
+      this.show_album_details_modal = true
+    }
   }
 }
 </script>

web-src/src/pages/SpotifyPagePlaylist.vue

@@ -10,8 +10,15 @@
     </template>
     <template slot="content">
       <p class="heading has-text-centered-mobile">{{ playlist.tracks.total }} tracks</p>
-      <spotify-list-item-track v-for="(item, index) in tracks" :key="item.track.id" :track="item.track" :album="item.track.album" :position="index" :context_uri="playlist.uri"></spotify-list-item-track>
+      <spotify-list-item-track v-for="(item, index) in tracks" :key="item.track.id" :track="item.track" :album="item.track.album" :position="index" :context_uri="playlist.uri">
+        <template slot="actions">
+          <a @click="open_track_dialog(item.track)">
+            <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
+          </a>
+        </template>
+      </spotify-list-item-track>
       <infinite-loading v-if="offset < total" @infinite="load_next"><span slot="no-more">.</span></infinite-loading>
+      <spotify-modal-dialog-track :show="show_track_details_modal" :track="selected_track" :album="selected_track.album" @close="show_track_details_modal = false" />
     </template>
   </content-with-heading>
 </template>
@@ -20,6 +27,7 @@
 import { LoadDataBeforeEnterMixin } from './mixin'
 import ContentWithHeading from '@/templates/ContentWithHeading'
 import SpotifyListItemTrack from '@/components/SpotifyListItemTrack'
+import SpotifyModalDialogTrack from '@/components/SpotifyModalDialogTrack'
 import store from '@/store'
 import webapi from '@/webapi'
 import SpotifyWebApi from 'spotify-web-api-js'
@@ -47,14 +55,17 @@ const playlistData = {
 export default {
   name: 'SpotifyPagePlaylist',
   mixins: [ LoadDataBeforeEnterMixin(playlistData) ],
-  components: { ContentWithHeading, SpotifyListItemTrack, InfiniteLoading },
+  components: { ContentWithHeading, SpotifyListItemTrack, SpotifyModalDialogTrack, InfiniteLoading },
 
   data () {
     return {
-      playlist: {},
+      playlist: { tracks: {} },
       tracks: [],
       total: 0,
-      offset: 0
+      offset: 0,
+
+      show_track_details_modal: false,
+      selected_track: {}
     }
   },
 
@@ -83,6 +94,11 @@ export default {
     play: function () {
       this.show_details_modal = false
       webapi.player_play_uri(this.playlist.uri, true)
+    },
+
+    open_track_dialog: function (track) {
+      this.selected_track = track
+      this.show_track_details_modal = true
     }
   }
 }

web-src/src/pages/SpotifyPageSearch.vue

@@ -31,8 +31,15 @@
         <p class="title is-4">Tracks</p>
       </template>
       <template slot="content">
-        <spotify-list-item-track v-for="track in tracks.items" :key="track.id" :track="track" :album="track.album" :position="0" :context_uri="track.uri"></spotify-list-item-track>
+        <spotify-list-item-track v-for="track in tracks.items" :key="track.id" :track="track" :album="track.album" :position="0" :context_uri="track.uri">
+          <template slot="actions">
+            <a @click="open_track_dialog(track)">
+              <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
+            </a>
+          </template>
+        </spotify-list-item-track>
         <infinite-loading v-if="query.type === 'track'" @infinite="search_tracks_next"><span slot="no-more">.</span></infinite-loading>
+        <spotify-modal-dialog-track :show="show_track_details_modal" :track="selected_track" :album="selected_track.album" @close="show_track_details_modal = false" />
       </template>
       <template slot="footer">
         <nav v-if="show_all_tracks_button" class="level">
@@ -50,8 +57,15 @@
         <p class="title is-4">Artists</p>
       </template>
       <template slot="content">
-        <spotify-list-item-artist v-for="artist in artists.items" :key="artist.id" :artist="artist"></spotify-list-item-artist>
+        <spotify-list-item-artist v-for="artist in artists.items" :key="artist.id" :artist="artist">
+          <template slot="actions">
+            <a @click="open_artist_dialog(artist)">
+              <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
+            </a>
+          </template>
+        </spotify-list-item-artist>
         <infinite-loading v-if="query.type === 'artist'" @infinite="search_artists_next"><span slot="no-more">.</span></infinite-loading>
+        <spotify-modal-dialog-artist :show="show_artist_details_modal" :artist="selected_artist" @close="show_artist_details_modal = false" />
       </template>
       <template slot="footer">
         <nav v-if="show_all_artists_button" class="level">
@@ -69,8 +83,15 @@
         <p class="title is-4">Albums</p>
       </template>
       <template slot="content">
-        <spotify-list-item-album v-for="album in albums.items" :key="album.id" :album="album"></spotify-list-item-album>
+        <spotify-list-item-album v-for="album in albums.items" :key="album.id" :album="album">
+          <template slot="actions">
+            <a @click="open_album_dialog(album)">
+              <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
+            </a>
+          </template>
+        </spotify-list-item-album>
         <infinite-loading v-if="query.type === 'album'" @infinite="search_albums_next"><span slot="no-more">.</span></infinite-loading>
+        <spotify-modal-dialog-album :show="show_album_details_modal" :album="selected_album" @close="show_album_details_modal = false" />
       </template>
       <template slot="footer">
         <nav v-if="show_all_albums_button" class="level">
@@ -88,8 +109,15 @@
         <p class="title is-4">Playlists</p>
       </template>
       <template slot="content">
-        <spotify-list-item-playlist v-for="playlist in playlists.items" :key="playlist.id" :playlist="playlist"></spotify-list-item-playlist>
+        <spotify-list-item-playlist v-for="playlist in playlists.items" :key="playlist.id" :playlist="playlist">
+          <template slot="actions">
+            <a @click="open_playlist_dialog(playlist)">
+              <span class="icon has-text-dark"><i class="mdi mdi-dots-vertical mdi-18px"></i></span>
+            </a>
+          </template>
+        </spotify-list-item-playlist>
         <infinite-loading v-if="query.type === 'playlist'" @infinite="search_playlists_next"><span slot="no-more">.</span></infinite-loading>
+        <spotify-modal-dialog-playlist :show="show_playlist_details_modal" :playlist="selected_playlist" @close="show_playlist_details_modal = false" />
       </template>
       <template slot="footer">
         <nav v-if="show_all_playlists_button" class="level">
@@ -110,6 +138,10 @@ import SpotifyListItemTrack from '@/components/SpotifyListItemTrack'
 import SpotifyListItemArtist from '@/components/SpotifyListItemArtist'
 import SpotifyListItemAlbum from '@/components/SpotifyListItemAlbum'
 import SpotifyListItemPlaylist from '@/components/SpotifyListItemPlaylist'
+import SpotifyModalDialogTrack from '@/components/SpotifyModalDialogTrack'
+import SpotifyModalDialogArtist from '@/components/SpotifyModalDialogArtist'
+import SpotifyModalDialogAlbum from '@/components/SpotifyModalDialogAlbum'
+import SpotifyModalDialogPlaylist from '@/components/SpotifyModalDialogPlaylist'
 import SpotifyWebApi from 'spotify-web-api-js'
 import webapi from '@/webapi'
 import * as types from '@/store/mutation_types'
@@ -117,7 +149,7 @@ import InfiniteLoading from 'vue-infinite-loading'
 
 export default {
   name: 'SpotifyPageSearch',
-  components: { ContentWithHeading, TabsSearch, SpotifyListItemTrack, SpotifyListItemArtist, SpotifyListItemAlbum, SpotifyListItemPlaylist, InfiniteLoading },
+  components: { ContentWithHeading, TabsSearch, SpotifyListItemTrack, SpotifyListItemArtist, SpotifyListItemAlbum, SpotifyListItemPlaylist, SpotifyModalDialogTrack, SpotifyModalDialogArtist, SpotifyModalDialogAlbum, SpotifyModalDialogPlaylist, InfiniteLoading },
 
   data () {
     return {
@@ -128,7 +160,19 @@ export default {
       playlists: { items: [], total: 0 },
 
       query: {},
-      search_param: {}
+      search_param: {},
+
+      show_track_details_modal: false,
+      selected_track: {},
+
+      show_album_details_modal: false,
+      selected_album: {},
+
+      show_artist_details_modal: false,
+      selected_artist: {},
+
+      show_playlist_details_modal: false,
+      selected_playlist: {}
     }
   },
 
@@ -321,6 +365,26 @@ export default {
     open_recent_search: function (query) {
       this.search_query = query
       this.new_search()
+    },
+
+    open_track_dialog: function (track) {
+      this.selected_track = track
+      this.show_track_details_modal = true
+    },
+
+    open_album_dialog: function (album) {
+      this.selected_album = album
+      this.show_album_details_modal = true
+    },
+
+    open_artist_dialog: function (artist) {
+      this.selected_artist = artist
+      this.show_artist_details_modal = true
+    },
+
+    open_playlist_dialog: function (playlist) {
+      this.selected_playlist = playlist
+      this.show_playlist_details_modal = true
     }
   },