From e0a9ccca24d3dcf435faa00ab55e682249b11b67 Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <fabio@manganiello.tech>
Date: Mon, 6 Nov 2023 01:54:12 +0100
Subject: [PATCH] [`media UI`] Component refactor.

- Fixed style of the floating control extensions panel.
- Extracted `ProgressBar` and `ExtraControls` into separate components.
---
 .../webapp/src/components/Media/Controls.vue  | 189 ++++--------------
 .../src/components/Media/ExtraControls.vue    |  55 +++++
 .../src/components/Media/ProgressBar.vue      |  71 +++++++
 .../src/components/Media/VolumeSlider.vue     |   4 +-
 .../src/components/elements/Dropdown.vue      |   2 +-
 .../backend/http/webapp/src/style/layout.scss |  12 +-
 6 files changed, 176 insertions(+), 157 deletions(-)
 create mode 100644 platypush/backend/http/webapp/src/components/Media/ExtraControls.vue
 create mode 100644 platypush/backend/http/webapp/src/components/Media/ProgressBar.vue

diff --git a/platypush/backend/http/webapp/src/components/Media/Controls.vue b/platypush/backend/http/webapp/src/components/Media/Controls.vue
index 5ec4f015..935c2ddc 100644
--- a/platypush/backend/http/webapp/src/components/Media/Controls.vue
+++ b/platypush/backend/http/webapp/src/components/Media/Controls.vue
@@ -3,7 +3,7 @@
     <div class="row">
       <div class="col-3">
       </div>
-      <div class="col-6">
+      <div class="col-6 buttons">
         <div class="buttons">
           <button @click="$emit('previous')" title="Play previous track" v-if="buttons_.previous">
             <i class="icon fa fa-step-backward"></i>
@@ -21,43 +21,18 @@
     </div>
 
     <div class="row">
-      <div class="col-9 volume-container">
-        <VolumeSlider :value="status.volume" :range="volumeRange" :status="status"
-          @mute="$emit('mute')" @unmute="$emit('unmute')"
-          @set-volume="$emit('set-volume', $event)" />
-      </div>
+      <VolumeSlider :value="status.volume" :range="volumeRange" :status="status"
+        @mute="$emit('mute')" @unmute="$emit('unmute')"
+        @set-volume="$emit('set-volume', $event)" />
 
-      <div class="col-3 list-controls">
-        <button @click="$emit('consume', !status.consume)" :class="{enabled: status.consume}"
-                title="Toggle consume mode" v-if="buttons_.consume">
-          <i class="icon fa fa-utensils"></i>
-        </button>
-
-        <button @click="$emit('random', !status.random)" :class="{enabled: status.random}"
-                title="Toggle shuffle" v-if="buttons_.random">
-          <i class="icon fa fa-random"></i>
-        </button>
-
-        <button @click="$emit('repeat', !status.repeat)" :class="{enabled: status.repeat}"
-                title="Toggle repeat" v-if="buttons_.repeat">
-          <i class="icon fa fa-redo"></i>
-        </button>
-      </div>
+      <ExtraControls :status="status" :buttons="buttons_"
+          @consume="$emit('consume', !status.consume)"
+          @random="$emit('random', !status.random)"
+          @repeat="$emit('repeat', !status.repeat)" />
     </div>
 
     <div class="row">
-      <div class="col-s-2 col-m-1 time">
-          <span class="elapsed-time"
-                v-text="elapsed != null && (status.state === 'play' || status.state === 'pause') ? convertTime(elapsed) : '-:--'"></span>
-      </div>
-      <div class="col-s-8 col-m-10 time-bar">
-        <Slider :value="elapsed" :range="[0, duration]" :disabled="!duration || status.state === 'stop'"
-                @mouseup="$emit('seek', $event.target.value)" />
-      </div>
-      <div class="col-s-2 col-m-1 time">
-          <span class="total-time"
-                v-text="duration && status.state !== 'stop' ? convertTime(duration) : '-:--'"></span>
-      </div>
+      <ProgressBar :elapsed="elapsed" :duration="duration" :status="status" @seek="$emit('seek', $event)" />
     </div>
   </div>
 
@@ -70,7 +45,7 @@
       </button>
     </div>
 
-    <div class="track-container col-s-8 col-m-8 col-l-3">
+    <div class="track-container col-s-9 col-m-9 col-l-3">
       <div class="track-info" v-if="track && status?.state !== 'stop'">
         <div class="title" v-if="status.state === 'play' || status.state === 'pause'">
           <a :href="$route.fullPath" v-text="track.title?.length ? track.title : '[No Title]'"
@@ -103,45 +78,25 @@
       </div>
 
       <div class="row">
-        <div class="col-1 time">
-          <span class="elapsed-time"
-                v-text="elapsed != null && (status.state === 'play' || status.state === 'pause') ? convertTime(elapsed) : '-:--'"></span>
-        </div>
-        <div class="col-10">
-          <Slider :value="elapsed" :range="[0, duration]" :disabled="!duration || status.state === 'stop'"
-                  @mouseup="$emit('seek', $event.target.value)" />
-        </div>
-        <div class="col-1 time">
-          <span class="total-time"
-                v-text="duration && status.state !== 'stop' ? convertTime(duration) : '-:--'"></span>
-        </div>
+        <ProgressBar :elapsed="elapsed" :duration="duration" :status="status" @seek="$emit('seek', $event)" />
       </div>
     </div>
 
-    <div class="col-2 pull-right until tablet right-buttons">
+    <div class="col-1 until tablet right-controls">
       <button @click="expanded = !expanded" :title="expanded ? 'Show more controls' : 'Hide extra controls'">
         <i class="fas" :class="[`fa-chevron-${expanded ? 'down' : 'up'}`]" />
       </button>
     </div>
 
-    <div class="col-3 pull-right from desktop">
-      <div class="row volume-container">
-        <VolumeSlider :value="status.volume" :range="volumeRange" :status="status"
-          @mute="$emit('mute')" @unmute="$emit('unmute')"
-          @set-volume="$emit('set-volume', $event)" />
-      </div>
-      <div class="row list-controls">
-        <button @click="$emit('consume')" :class="{enabled: status.consume}" title="Toggle consume mode" v-if="buttons_.consume">
-          <i class="icon fa fa-utensils"></i>
-        </button>
-        <button @click="$emit('random')" :class="{enabled: status.random}" title="Toggle shuffle" v-if="buttons_.random">
-          <i class="icon fa fa-random"></i>
-        </button>
-        <button @click="$emit('repeat')" :class="{enabled: status.repeat}" title="Toggle repeat" v-if="buttons_.repeat">
-          <i class="icon fa fa-redo"></i>
-        </button>
-      </div>
+    <div class="col-3 from desktop right-controls">
+      <VolumeSlider :value="status.volume" :range="volumeRange" :status="status"
+        @mute="$emit('mute')" @unmute="$emit('unmute')"
+        @set-volume="$emit('set-volume', $event)" />
 
+      <ExtraControls :status="status" :buttons="buttons_"
+          @consume="$emit('consume', !status.consume)"
+          @random="$emit('random', !status.random)"
+          @repeat="$emit('repeat', !status.repeat)" />
     </div>
   </div>
 </template>
@@ -149,11 +104,12 @@
 <script>
 import Utils from "@/Utils"
 import MediaUtils from "@/components/Media/Utils";
-import Slider from "@/components/elements/Slider";
+import ExtraControls from "./ExtraControls";
+import ProgressBar from "./ProgressBar";
 import VolumeSlider from "./VolumeSlider";
 
 export default {
-  components: {Slider, VolumeSlider},
+  components: {ExtraControls, ProgressBar, VolumeSlider},
   mixins: [Utils, MediaUtils],
   emits: [
     'consume',
@@ -282,10 +238,15 @@ button {
   flex-direction: column;
   display: none;
   overflow: hidden;
+  padding: .5em;
 
   @include until($desktop) {
     display: flex;
-    padding-top: .5em;
+  }
+
+  :deep(.extra-controls-container) {
+    @extend .pull-right;
+    flex: 1;
   }
 
   .row {
@@ -293,34 +254,10 @@ button {
   }
 
   .buttons {
+    display: flex;
     justify-content: center;
     margin: 0;
   }
-
-  .volume-container,
-  .list-controls {
-    display: flex;
-    align-items: center;
-
-    button {
-      padding: 0 .25em;
-    }
-  }
-
-  .list-controls {
-    margin-top: -.5em;
-    flex-flow: row-reverse;
-  }
-
-  .time {
-    &:first-child {
-      margin-left: .25em;
-    }
-
-    &:last-child {
-      margin-right: .25em;
-    }
-  }
 }
 
 .controls {
@@ -336,12 +273,6 @@ button {
     display: flex;
   }
 
-  .volume-container {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-
   .track-container {
     display: flex;
     flex-direction: column;
@@ -380,24 +311,6 @@ button {
   }
 
   .playback-controls {
-    &.mobile {
-      display: none;
-
-      @include until($tablet) {
-        display: flex !important;
-        align-items: center;
-      }
-    }
-
-    &.tablet {
-      display: none;
-
-      @media screen and (min-width: $tablet) and (max-width: $desktop - 1) {
-        display: flex !important;
-        align-items: center;
-      }
-    }
-
     .row {
       justify-content: center;
     }
@@ -423,47 +336,25 @@ button {
     }
   }
 
-  .list-controls {
-    height: 50%;
-    opacity: 0.7;
+  .right-controls {
+    @extend .pull-right;
+
     display: flex;
-    align-items: center;
-    margin-bottom: 1em;
-    flex-flow: row-reverse;
-  }
+    flex-direction: column;
+    flex: 1;
+    align-items: end;
 
-  .mobile.right-buttons {
-    @include until ($desktop) {
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
-      flex: 1;
-    }
-  }
-
-  .pull-right {
     button {
       padding: 0.5em;
     }
+
+    :deep(.extra-controls-container) {
+      @extend .pull-right;
+    }
   }
 
   .seek-slider {
     width: 75%;
   }
 }
-
-.time {
-  font-size: .7em;
-  position: relative;
-}
-
-.elapsed-time {
-  text-align: right;
-  float: right;
-}
-
-.time-bar {
-  flex-grow: 1;
-  margin: 0 .5em;
-}
 </style>
diff --git a/platypush/backend/http/webapp/src/components/Media/ExtraControls.vue b/platypush/backend/http/webapp/src/components/Media/ExtraControls.vue
new file mode 100644
index 00000000..797c1fb9
--- /dev/null
+++ b/platypush/backend/http/webapp/src/components/Media/ExtraControls.vue
@@ -0,0 +1,55 @@
+<template>
+  <div class="extra-controls-container">
+    <button @click="$emit('consume')" :class="{enabled: status.consume}" title="Toggle consume mode" v-if="buttons.consume">
+      <i class="icon fa fa-utensils"></i>
+    </button>
+    <button @click="$emit('random')" :class="{enabled: status.random}" title="Toggle shuffle" v-if="buttons.random">
+      <i class="icon fa fa-random"></i>
+    </button>
+    <button @click="$emit('repeat')" :class="{enabled: status.repeat}" title="Toggle repeat" v-if="buttons.repeat">
+      <i class="icon fa fa-redo"></i>
+    </button>
+  </div>
+</template>
+
+<script>
+export default {
+  emits: ['consume', 'random', 'repeat'],
+  props: {
+    status: {
+      type: Object,
+      default: () => ({}),
+    },
+
+    buttons: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.extra-controls-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  opacity: 0.7;
+
+  button {
+    margin: 0 .25em;
+    padding: 0;
+    background: none;
+    border: 0;
+
+    &.enabled {
+      color: $selected-fg;
+    }
+
+    &:not(:disabled):hover {
+      color: $default-hover-fg;
+      opacity: 1;
+    }
+  }
+}
+</style>
diff --git a/platypush/backend/http/webapp/src/components/Media/ProgressBar.vue b/platypush/backend/http/webapp/src/components/Media/ProgressBar.vue
new file mode 100644
index 00000000..a06db86d
--- /dev/null
+++ b/platypush/backend/http/webapp/src/components/Media/ProgressBar.vue
@@ -0,0 +1,71 @@
+<template>
+  <div class="progress-bar-container">
+    <div class="col-s-2 col-m-1 time">
+        <span class="elapsed-time"
+              v-text="elapsed != null && (status.state === 'play' || status.state === 'pause') ? convertTime(elapsed) : '-:--'"></span>
+    </div>
+    <div class="col-s-8 col-m-10 time-bar">
+      <Slider :value="elapsed" :range="[0, duration]" :disabled="!duration || status.state === 'stop'"
+              @input="$emit('seek', $event.target.value)" />
+    </div>
+    <div class="col-s-2 col-m-1 time">
+        <span class="total-time"
+              v-text="duration && status.state !== 'stop' ? convertTime(duration) : '-:--'"></span>
+    </div>
+  </div>
+</template>
+
+<script>
+import MediaUtils from "@/components/Media/Utils";
+import Slider from "@/components/elements/Slider";
+
+export default {
+  components: {Slider},
+  emits: ['seek'],
+  mixins: [MediaUtils],
+
+  props: {
+    elapsed: {
+      type: Number,
+    },
+
+    duration: {
+      type: Number,
+    },
+
+    // Current player status
+    status: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+$time-width: 2.5em;
+
+.progress-bar-container {
+  width: 100%;
+  display: flex;
+  align-items: center;
+
+  .time {
+    width: $time-width;
+    font-size: .7em;
+    position: relative;
+    margin-left: 0;
+  }
+
+  .elapsed-time {
+    text-align: right;
+    float: right;
+  }
+
+  .time-bar {
+    width: calc(100% - #{$time-width * 2} - 2em);
+    flex-grow: 1;
+    margin: 0 .5em;
+  }
+}
+</style>
diff --git a/platypush/backend/http/webapp/src/components/Media/VolumeSlider.vue b/platypush/backend/http/webapp/src/components/Media/VolumeSlider.vue
index 1b2a2015..f7071526 100644
--- a/platypush/backend/http/webapp/src/components/Media/VolumeSlider.vue
+++ b/platypush/backend/http/webapp/src/components/Media/VolumeSlider.vue
@@ -45,13 +45,15 @@ export default {
 
 .volume-slider-container {
   min-width: 15em;
+  max-width: 25em;
   display: inline-flex;
   align-items: center;
+  flex: 1;
 
   .volume-slider {
     margin: 0;
     padding: 0 .5em 0 1em;
-    flex-grow: 1;
+    flex: 1;
   }
 
   button {
diff --git a/platypush/backend/http/webapp/src/components/elements/Dropdown.vue b/platypush/backend/http/webapp/src/components/elements/Dropdown.vue
index 35bb09b0..765365c1 100644
--- a/platypush/backend/http/webapp/src/components/elements/Dropdown.vue
+++ b/platypush/backend/http/webapp/src/components/elements/Dropdown.vue
@@ -120,7 +120,7 @@ export default {
   flex-direction: column;
 
   button {
-    background: $default-bg-2;
+    background: none;
     border: 0;
     padding: 0.5em;
 
diff --git a/platypush/backend/http/webapp/src/style/layout.scss b/platypush/backend/http/webapp/src/style/layout.scss
index 48a39f2a..ee90e305 100644
--- a/platypush/backend/http/webapp/src/style/layout.scss
+++ b/platypush/backend/http/webapp/src/style/layout.scss
@@ -159,23 +159,23 @@ $width-ranges: (
   .#{$name} {
     &.from {
       @include until(nth($range, 1)) {
-        display: none;
+        display: none !important;
       }
     }
 
     &.until {
       @include from(nth($range, 2)) {
-        display: none;
+        display: none !important;
       }
     }
 
     &.only {
       @include until(nth($range, 1)) {
-        display: none;
+        display: none !important;
       }
 
       @include from(nth($range, 2)) {
-        display: none;
+        display: none !important;
       }
     }
   }
@@ -183,13 +183,13 @@ $width-ranges: (
 
 .mobile {
   @include from($tablet) {
-    display: none;
+    display: none !important;
   }
 }
 
 .fullhd {
   @include until($fullhd) {
-    display: none;
+    display: none !important;
   }
 }