@saooti/octopus-sdk 30.0.7 → 30.0.11

package/src/components/misc/PlayerButtons.vue

@@ -6,26 +6,19 @@
     <img
       :src="podcastImage"
       :alt="$t('Podcast image')"
-      class="player-image c-hand"
+      class="player-image"
     >
   </router-link>
   <div
     v-if="!playerError"
-    class="play-button-box"
-    :class="{
-      'primary-bg': !isLoading,
-      'text-light': !isLoading,
-    }"
+    class="play-button-box text-light primary-bg"
     @click="switchPausePlay"
   >
     <div
-      class="text-light"
       :aria-label="$t('Play')"
       :class="{
-        saooti: isPlaying || isPaused,
         'saooti-play2-bounty': isPaused,
         'saooti-pause-bounty': isPlaying,
-        loading: isLoading,
       }"
     />
   </div>
@@ -35,7 +28,7 @@
     @click="stopPlayer"
   >
     <div
-      class="text-light saooti-stop-bounty"
+      class="saooti-stop-bounty"
       :aria-label="$t('Stop')"
     />
   </div>
@@ -54,11 +47,6 @@ export default defineComponent({
     playerError: { default: false, type: Boolean},
   },
 
-  data() {
-    return {
-    };
-  },
-
   computed: {
     isPlaying(): boolean {
       return 'PLAYING' === this.$store.state.player.status;
@@ -66,9 +54,6 @@ export default defineComponent({
     isPaused(): boolean {
       return 'PAUSED' === this.$store.state.player.status;
     },
-    isLoading(): boolean {
-      return 'LOADING' === this.$store.state.player.status;
-    },
     isImage(): boolean {
       return (state.player.image as boolean);
     },
@@ -131,7 +116,6 @@ export default defineComponent({
     stopPlayer(): void {
       this.$store.commit('playerPlayPodcast');
     },
-    
     onPlay(): void {
       this.$store.commit('playerPause', false);
     },
@@ -143,6 +127,17 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
+.player-image {
+  border-radius: 0.2rem;
+  height: 2.4rem;
+  width: 2.4rem;
+  cursor: pointer;
+  /** PHONES*/
+  @media (max-width: 450px) {
+    height: 1.8rem;
+    width: 1.8rem;
+  }
+}
 .play-button-box {
   height: 2.5rem;
   width: 2.5rem;
@@ -156,22 +151,4 @@ export default defineComponent({
   cursor: pointer;
 }
 
-.player-container {
-  .player-image {
-    border-radius: 0.2rem;
-    height: 2.4rem;
-    width: 2.4rem;
-  }
-
-}
-/** PHONES*/
-@media (max-width: 450px) {
-  .player-container {
-    .player-image {
-      height: 2rem;
-      width: 2rem;
-    }
-  }
-}
-
 </style>

package/src/components/misc/PlayerClockAndTimeline.vue

@@ -5,7 +5,7 @@
     @click="$emit('update:showTimeline', !showTimeline)"
   >
     <div
-      class="saooti-arrow_down saooti-arrow_down-margin"
+      class="saooti-arrow_down"
       :class="showTimeline ? '' : 'arrow-transform'"
     />
     <div>Timeline</div>

package/src/components/misc/PlayerProgressBar.vue

@@ -1,18 +1,17 @@
 <template>
   <div class="text-light player-grow-content">
-    <div class="d-flex">
+    <div class="d-flex mb-1">
       <div
         v-if="playerError"
-        class="text-warning player-title ms-2 me-2"
+        class="text-warning mx-2"
       >
         {{ $t('Podcast play error') + ' - ' }}
       </div>
-      <div class="flex-grow player-title">
+      <div class="flex-grow-1 text-truncate">
         {{ podcastTitle }}
       </div>
       <div
-        v-if="!playerError"
-        v-show="!isBarTop"
+        v-if="!playerError && !isBarTop"
         class="hide-phone"
       >
         {{ playedTime }} / {{ totalTime }}
@@ -21,12 +20,11 @@
     <div
       v-if="!playerError"
       v-show="!isBarTop"
-      class="progress c-hand custom-bg-darkgrey"
-      style="height: 3px;"
+      class="progress c-hand"
       @mouseup="seekTo"
     >
       <div
-        class="progress-bar custom-bg-grey"
+        class="progress-bar bg-light"
         role="progressbar"
         aria-valuenow="0"
         aria-valuemin="0"
@@ -79,12 +77,7 @@ export default defineComponent({
     notListenTime: { default: 0, type: Number},
   },
   emits: ['update:notListenTime'],
-
-  data() {
-    return {
-    };
-  },
-
+  
   computed: {
     isEmissionName(): boolean {
       return (state.player.emissionName as boolean);
@@ -153,10 +146,15 @@ export default defineComponent({
 </script>
 
 <style lang="scss">
-.player-container {
+.player-grow-content {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  flex-shrink: 1;
+  overflow: hidden;
+  font-size: 0.8rem;
   .progress {
-    align-items: flex-end;
-    height: 10px;
+    height: 4px;
     position: relative;
   }
   .progress-bar-duration {
@@ -166,38 +164,5 @@ export default defineComponent({
     height: 4px;
     position: absolute;
   }
-
-  .progress.custom-bg-darkgrey {
-    background: #555;
-  }
-
-  .progress-bar.custom-bg-grey {
-    background: #e9ecef;
-  }
-
-  .player-title,
-  .hide-phone {
-    font-size: 0.8rem;
-    margin: 0 0 5px 0;
-  }
-  .player-grow-content {
-    display: flex;
-    flex-grow: 1;
-    flex-direction: column;
-    flex-shrink: 1;
-    flex-basis: 20px;
-    overflow: hidden;
-  }
-}
-/** PHONES*/
-@media (max-width: 960px) {
-  .player-container {
-    .player-title {
-      font-size: 12px;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-  }
 }
 </style>

package/src/components/misc/TopBar.vue

@@ -1,137 +1,120 @@
 <template>
   <div
-    v-if="init"
-    class="top-bar-container position-sticky"
+    class="top-bar-container"
     :class="{ 'shadow-element': scrolled }"
   >
-    <div class="top-bar">
-      <div
-        class="hamburger-menu"
-        :aria-label="$t('open left Menu')"
-        @click="onDisplayMenu(false)"
+    <div
+      class="saooti-burger-menu"
+      :aria-label="$t('open left Menu')"
+      @click="onDisplayMenu(false)"
+    />
+    <router-link
+      class="top-bar-logo"
+      :to="{
+        name: 'home',
+        query: { productor: $store.state.filter.organisationId,
+                 iabId: $store.state.filter.iab ? $store.state.filter.iab.id : undefined,
+                 rubriquesId: rubriqueQueryParam},
+      }"
+      @click="onDisplayMenu(true)"
+    >
+      <img
+        :src="!filterOrga || '' === imgUrl ? logoUrl : imgUrl"
+        :alt="$t('Logo of main page')"
+        :class="isEducation ? 'educationLogo' : ''"
       >
-        <div class="saooti-burger-menu h3" />
-      </div>
+    </router-link>
+    <OrganisationChooserLight
+      v-if="!isPodcastmaker"
+      page="topBar"
+      width="auto"
+      :defaultanswer="$t('No organisation filter')"
+      :value="organisationId"
+      class="me-2"
+      :reset="reset"
+      @selected="onOrganisationSelected"
+    />
+    <div class="d-flex justify-content-center flex-grow-1">
       <router-link
+        v-if="
+          isLiveTab &&
+            ((filterOrga && filterOrgaLive) || !filterOrga)
+        "
         :to="{
-          name: 'home',
+          name: 'lives',
+          query: { productor: $store.state.filter.organisationId },
+        }"
+        class="link-hover p-3 fw-bold"
+      >
+        {{ $t('Live') }}
+      </router-link>
+      <router-link
+        :to="{
+          name: 'podcasts',
           query: { productor: $store.state.filter.organisationId,
                    iabId: $store.state.filter.iab ? $store.state.filter.iab.id : undefined,
                    rubriquesId: rubriqueQueryParam},
         }"
+        class="link-hover p-3 fw-bold"
       >
-        <div
-          class="top-bar-logo m-3"
-          @click="onDisplayMenu(true)"
-        >
-          <img
-            v-if="!filterOrga || '' === imgUrl"
-            :src="logoUrl"
-            :alt="$t('Logo of main page')"
-            :class="isEducation ? 'educationLogo' : ''"
-          >
-          <img
-            v-else
-            :src="imgUrl"
-            :alt="$t('Logo of main page')"
-          >
-        </div>
+        {{ $t('Podcasts') }}
       </router-link>
-      <OrganisationChooserLight
-        v-if="!isPodcastmaker"
-        width="auto"
-        page="topBar"
-        :defaultanswer="$t('No organisation filter')"
-        :value="organisationId"
-        :light="true"
-        class="me-2 hide-top-bar"
-        :reset="reset"
-        @selected="onOrganisationSelected"
-      />
-      <div class="d-flex align-items-center justify-content-center flex-grow">
-        <router-link
-          v-if="
-            isLiveTab &&
-              ((filterOrga && filterOrgaLive) || !filterOrga)
-          "
-          :to="{
-            name: 'lives',
-            query: { productor: $store.state.filter.organisationId },
-          }"
-          class="linkHover p-3 text-dark fw-bold"
-        >
-          {{ $t('Live') }}
-        </router-link>
+      <router-link
+        :to="{
+          name: 'emissions',
+          query: { productor: $store.state.filter.organisationId,
+                   iabId: $store.state.filter.iab ? $store.state.filter.iab.id : undefined,
+                   rubriquesId: rubriqueQueryParam },
+        }"
+        class="link-hover p-3 fw-bold"
+      >
+        {{ $t('Emissions') }}
+      </router-link>
+      <router-link
+        :to="{
+          name: 'participants',
+          query: { productor: $store.state.filter.organisationId },
+        }"
+        class="link-hover p-3 fw-bold"
+      >
+        {{ $t('Speakers') }}
+      </router-link>
+      <router-link
+        :to="{
+          name: 'playlists',
+          query: { productor: $store.state.filter.organisationId },
+        }"
+        class="link-hover p-3 fw-bold"
+      >
+        {{ $t('Playlists') }}
+      </router-link>
+      <router-link
+        v-if="!isPodcastmaker && (!filterOrga || isEducation)"
+        :to="{
+          name: 'productors',
+          query: { productor: $store.state.filter.organisationId },
+        }"
+        class="link-hover p-3 fw-bold"
+      >
+        {{ $t('Productors') }}
+      </router-link>
+    </div>
+    <div class="d-flex flex-column">
+      <div class="hosted-by">
+        <span>{{ $t('Hosted by') }}</span><span class="ms-1 me-1 primary-color">Saooti</span>
+      </div>
+      <div class="d-flex justify-content-end flex-nowrap">
+        <HomeDropdown :is-education="isEducation" />
         <router-link
+          :aria-label="$t('Search')"
           :to="{
             name: 'podcasts',
-            query: { productor: $store.state.filter.organisationId,
-                     iabId: $store.state.filter.iab ? $store.state.filter.iab.id : undefined,
-                     rubriquesId: rubriqueQueryParam},
-          }"
-          class="linkHover p-3 text-dark fw-bold"
-        >
-          {{ $t('Podcasts') }}
-        </router-link>
-        <router-link
-          :to="{
-            name: 'emissions',
-            query: { productor: $store.state.filter.organisationId,
-                     iabId: $store.state.filter.iab ? $store.state.filter.iab.id : undefined,
-                     rubriquesId: rubriqueQueryParam },
-          }"
-          class="linkHover p-3 text-dark fw-bold"
-        >
-          {{ $t('Emissions') }}
-        </router-link>
-        <router-link
-          :to="{
-            name: 'participants',
-            query: { productor: $store.state.filter.organisationId },
-          }"
-          class="linkHover p-3 text-dark fw-bold"
-        >
-          {{ $t('Speakers') }}
-        </router-link>
-        <router-link
-          :to="{
-            name: 'playlists',
             query: { productor: $store.state.filter.organisationId },
           }"
-          class="linkHover p-3 text-dark fw-bold"
         >
-          {{ $t('Playlists') }}
-        </router-link>
-        <router-link
-          v-if="!isPodcastmaker && (!filterOrga || isEducation)"
-          :to="{
-            name: 'productors',
-            query: { productor: $store.state.filter.organisationId },
-          }"
-          class="linkHover p-3 text-dark fw-bold"
-        >
-          {{ $t('Productors') }}
+          <div class="btn admin-button m-1 saooti-search" />
         </router-link>
       </div>
-      <div class="d-flex flex-column">
-        <div class="d-flex justify-content-end hostedBy hide-phone">
-          <span>{{ $t('Hosted by') }}</span><span class="ms-1 me-1 primary-color">Saooti</span>
-        </div>
-        <div class="d-flex align-items-center justify-content-end flex-no-wrap">
-          <HomeDropdown :is-education="isEducation" />
-          <router-link
-            :aria-label="$t('Search')"
-            :to="{
-              name: 'podcasts',
-              query: { productor: $store.state.filter.organisationId },
-            }"
-          >
-            <div class="btn admin-button m-1">
-              <i class="saooti-search text-dark" />
-            </div>
-          </router-link>
-        </div>
-      </div>
     </div>
   </div>
 </template>
@@ -166,11 +149,9 @@ export default defineComponent({
       minScroll: 0 as number,
       organisationId: undefined as string | undefined,
       reset: false as boolean,
-      init: false as boolean,
       dummyParam: new Date().getTime().toString() as string,
     };
   },
-
  
   computed: {
     rubriqueQueryParam(): string|undefined{
@@ -218,7 +199,6 @@ export default defineComponent({
     if (this.filterOrga) {
       this.organisationId = this.filterOrga;
     }
-    this.init = true;
     window.addEventListener('scroll', this.handleScroll);
   },
 
@@ -278,139 +258,76 @@ export default defineComponent({
 
 <style lang="scss">
 .top-bar-container {
+  position: sticky;
   top: 0;
   background: #fff;
   width: 100%;
+  height: 5rem;
   z-index: 10;
-  padding: 0 2em;
-
+  padding: 0 1rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  transition: height 1s;
   @media (max-width: 450px) {
     padding: 0 0.5rem;
   }
 
-  .top-bar {
-    transition: height 1s;
-    display: flex;
-    width: 100%;
-    justify-content: space-between;
-    align-items: center;
-    height: 5rem;
-    position: relative;
-
-    .top-bar-logo {
-      margin: 1rem 2rem 1rem 1rem !important;
-      img {
-        max-width: 160px !important;
-        max-height: 80px;
-        height: 80px;
-        border-radius: 0.8rem;
-        &.educationLogo {
-          height: auto;
-          border-radius: 0;
-        }
-      }
-    }
-    .multiselect__tags {
-      padding: 6px 40px 0 10px;
-    }
-
-    .hamburger-menu {
-      display: none;
-      margin: 0 1rem;
-      @media (max-width: 600px) {
-        margin: 0;
-      }
-      .saooti-burger-menu {
-        font-size: 2.2em;
-        font-weight: bold;
-        margin-bottom: 0;
-      }
-      cursor: pointer;
-    }
+  .saooti-burger-menu {
+    display: none;
+    cursor: pointer;
+    font-size: 2rem;
+    font-weight: bold;
+    margin: 0.5rem;
   }
 
-  &.shadow-element {
-    .linkHover {
-      display: none;
-    }
-    .top-bar {
-      height: 3.5rem;
-
-      .hamburger-menu {
-        display: block;
-        .saooti-burger-menu {
-          font-size: 2.2em;
-          font-weight: bold;
-          margin: 0;
-        }
-      }
-      .top-bar-logo {
-        flex-grow: 1;
-        text-align: center;
-        align-items: center;
-        display: flex;
-        img {
-          height: 2.5rem;
-          width: auto;
-        }
-      }
-      .hostedBy {
-        display: none !important;
+  .top-bar-logo {
+    margin: 1rem 2rem 1rem 1rem;
+    img {
+      max-width: 160px !important;
+      max-height: 2.5rem;
+      height: 2.5rem;
+      &.educationLogo {
+        height: auto;
       }
     }
   }
-  .hostedBy {
+  .hosted-by {
     font-size: 0.6rem;
     position: absolute;
     top: 5px;
     right: 0;
   }
-
+  .multiselect__tags {
+    padding: 6px 40px 0 10px;
+  }
+  &.shadow-element {
+    height: 3.5rem;
+    .link-hover,.hosted-by {
+      display: none;
+    }
+    .saooti-burger-menu {
+      display: block;
+    }
+  }
   /** PHONES*/
   @media (max-width: 1200px) {
-    .hide-top-bar {
-      display: none !important;
-    }
-    .hostedBy {
-      display: none !important;
+    height: 3.5rem;
+    .default-multiselect-width, .hosted-by, .link-hover {
+      display: none;
     }
-    .top-bar {
-      padding: 0;
-      height: 3.5rem;
-      .linkHover {
-        display: none;
-      }
-      .hamburger-menu {
-        flex-grow: 1;
-        display: block;
-      }
-      .top-bar-logo {
-        flex-grow: 1;
-        text-align: center;
-        display: flex;
-        width: 100px;
-        img {
-          max-width: 100px !important;
-        }
-      }
+    .saooti-burger-menu {
+      display: block;
     }
   }
   @media (max-width: 650px) {
-    .top-bar {
-      .top-bar-logo {
-        img {
-          height: 2rem;
-        }
-      }
+    .top-bar-logo img{
+      height: 2rem;
     }
   }
   @media (max-width: 290px) {
-    .top-bar {
-      .top-bar-logo {
-        img {
-          display: none;
-        }
-      }
+    .top-bar-logo img{
+      display: none;
     }
   }
 }