Merge pull request 'add a diffrent icon, if media is playing' (#39) from dev into main

Reviewed-on: #39

src/components/dialogs/AlbumViewer.vue

@@ -3,9 +3,8 @@
     <div id="albumViewer" class="flex-row">
       <div id="header" class="flex-column grow">
         <div id="background" :style="coverBackground" />
-        <div it="title" class="flex-column pa grow z1">
+        <div id="title" class="flex-column pa grow z1">
           <img class="glow ma" :src="cover" />
-
           <span id="stats" class="center">
             {{ selectedAlbum.title }}
             <br />
@@ -16,22 +15,21 @@
               from year <b>{{ album_year }}</b> </span><br />
             <b>{{ album_tracks.length }}</b> Tracks with a duration of
             <b>{{ album_duration }}</b>
-
           </span>
-          <div class=" grow">
+          <div class="grow"> </div>
-
-          </div>
           <div class="flex-row grow ma-top">
-
             <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="['far', 'star']" size="2x" class="white-text favourite" v-else />
             </button>
-            <button class="flat ma-right" @click="playProgress" v-if="selectedAlbum.progress">
+            <button class="flat ma-right" title="Keep playing" v-if="selectedAlbum._id == selectedTrackContainer._id && isPlaying">
-              <awesome-icon icon="play" size="2x" class="primary-text" title="Keep playing" />
+              <awesome-icon icon="compact-disc" size="2x" class="primary-text" />
             </button>
-            <button class="flat ma-right" @click="playAlbum" v-else>
+            <button class="flat ma-right" title="Keep playing" @click="playProgress" v-else-if="selectedAlbum.progress">
-              <awesome-icon icon="play" size="2x" class="white-text" title="Play" />
+              <awesome-icon icon="play" size="2x" class="primary-text" />
+            </button>
+            <button class="flat ma-right" title="Play" @click="playAlbum" v-else>
+              <awesome-icon icon="play" size="2x" class="white-text" />
             </button>
             <button @click="gotoPrevAlbum" class="flat ma-left ma-right" :title="prevAlbum.name" :disabled="!prevAlbum._id">
               <awesome-icon icon="angle-left" class="ma4 white-text" />
@@ -248,7 +246,9 @@ export default {
       nextAlbum: ["albums/nextAlbum"],
       selectedAlbum: ["albums/selectedAlbum"],
       selectedTrack: ["tracks/selectedTrack"],
+      selectedTrackContainer: ["tracks/selectedTrackContainer"],
       favourites: ["user/favourites"],
+      isPlaying: ["player/isPlaying"],
     }),
     album_title() {
       return this.selectedAlbum.title;

src/components/dialogs/ArtistViewer.vue

@@ -17,7 +17,10 @@
               <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 />
             </button>
-            <button class="flat ma-right" @click="playProgress" title="Keep playing" v-if="selectedArtist.progress">
+            <button class="flat ma-right" title="Keep playing" v-if="selectedArtist._id == selectedTrackContainer._id && isPlaying">
+              <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" />
             </button>
             <button class="flat ma-right" @click="playArtist" title="Play" v-else>
@@ -176,6 +179,7 @@ export default {
       nextArtist: ["artists/nextArtist"],
       selectedArtist: ["artists/selectedArtist"],
       selectedTrack: ["tracks/selectedTrack"],
+      selectedTrackContainer: ["tracks/selectedTrackContainer"],
       favourites: ["user/favourites"],
       isPlaying: ["player/isPlaying"]
     }),

src/components/dialogs/BoxViewer.vue

@@ -1,18 +1,38 @@
 <template>
-  <DialogBase ref="dialogWindow" :title="selectedBox.title" @canceled="closed" :showFooter="false" :closeOnEscape="selectedVideo._id == null" :disableXscroll="true" :disableYscroll="true">
+  <DialogBase ref="dialogWindow" :title="selectedBox.title" @canceled="closed" :showFooter="false" :closeOnEscape="selectedVideo._id == null" :disableXscroll="true" :disableYscroll="true" :flatDialogHeader="true">
     <div id="boxViewer" class="flex-row">
-      <div id="header" class="flex-column">
+      <div id="header" class="flex-column grow">
         <div id="background" :style="coverBackground" />
-        <div class="grow z1 center flex-column">
+        <div id="title" class="grow z1 pa flex-column">
-          <img class="glow ma24" :src="cover" @dblclick="dblclick" />
+          <img class="glow ma" :src="cover" />
-        </div>
+          <span id="stats" class="center">
-        <awesome-icon icon="star" size="2x" class="favourite ma4 z2" :class="{ active: isFavourite }" @click="toggleFavourite" />
+            <b>{{ selectedBox.title }}</b>
-        <awesome-icon icon="play" size="2x" class="keepPlaying ma4 primary-text" @click="playProgress" v-if="selectedBox.progress" title="Keep playing" />
+            <br />
+            <b>{{ box_videos.length }}</b> Videos
+          </span>
 
-        <div id="stats" class="flex-row z1">
+          <div class="grow"> </div>
+          <div class="flex-row ma-top grow">
+            <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="['far', 'star']" size="2x" class="white-text favourite" v-else />
+            </button>
+            <button class="flat ma-right" title="Keep playing" @click="playProgress" v-if="selectedBox.progress">
+              <awesome-icon icon="play" size="2x" class="primary-text" />
+            </button>
+            <button class="flat ma-right" title="Play" @dblclick="dblclick" v-else>
+              <awesome-icon icon="play" size="2x" class="white-text" />
+            </button>
+            <button @click="gotoPrevBox" class="flat ma-left ma-right" :title="prevBox.name" :disabled="!prevBox._id">
+              <awesome-icon icon="angle-left" class="ma4 white-text" />
+            </button>
+            <button @click="gotoNextBox" class="flat" :title="nextBox.name" :disabled="!nextBox._id">
+              <awesome-icon icon="angle-right" class="ma4 white-text" />
+            </button>
+            <div class="grow"></div>
             <DropDown v-if="$store.getters['user/isAdministrator']">
               <button class="flat center" :title="visibility_text">
-              <awesome-icon :icon="visibility_icon" />
+                <awesome-icon :icon="visibility_icon" class="white-text" />
               </button>
               <template v-slot:dropdown-content>
                 <div>
@@ -34,18 +54,9 @@
                 </div>
               </template>
             </DropDown>
-          <div class="grow flex-column">
-            <p class="ma4 center">
-              <span class="">
-                <b>{{ selectedBox.title }}</b>
-                <br />
-                <b>{{ box_videos.length }}</b> Videos
-              </span>
-            </p>
-          </div>
             <DropDown v-if="$store.getters['user/isAdministrator']">
               <button class="flat center">
-              <awesome-icon icon="ellipsis-v" />
+                <awesome-icon icon="ellipsis-v" class="white-text" />
               </button>
               <template v-slot:dropdown-content>
                 <div>
@@ -64,7 +75,7 @@
             </DropDown>
           </div>
         </div>
-
+      </div>
       <ul id="videoList" class="videos">
         <li v-for="item in selectedBox.videos" :key="item._id">
           <VideoItem :video="item" />
@@ -265,7 +276,7 @@ export default {
 
 <style scoped>
 #boxViewer {
-  height: 462px;
+  height: 486px;
 }
 
 #header {
@@ -280,13 +291,8 @@ export default {
 
 #stats {
   z-index: 2;
-  align-items: center;
   color: var(--white);
   text-shadow: 0 1px 2px black;
-  line-height: 1.4;
-  background-color: #ffffff40;
-  border-top: 1px solid #ffffff20;
-  border-bottom: 1px solid #00000020;
 }
 
 .dropdown-activator button {
@@ -294,11 +300,6 @@ export default {
   height: 32px;
 }
 
-#stats p {
-  max-width: 192px;
-  align-self: center;
-}
-
 #videoList {
   background-color: var(--white);
   z-index: 1;

src/views/Home.vue

@@ -81,13 +81,13 @@ export default {
       messageCommands: [
         {
           title: "Scan for Music files",
-          subtitle: "Scann your server for music files…",
+          subtitle: "Scan your server for music files…",
           icon: "music",
           command: "scanMusic",
         },
         {
           title: "Scan for Video files",
-          subtitle: "Scann your server for video files…",
+          subtitle: "Scan your server for video files…",
           icon: "video",
           command: "scanVideos",
         },