@saooti/octopus-sdk 31.0.26 → 31.0.29

package/README.md

@@ -581,6 +581,10 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 30.0.82 Cherry pick Color Qr code
  * 30.0.83 Locales parlement
  * 30.0.84 Une émission non visible n'apparaît pas dans la page émission
+ * 30.0.85 PB en cliquant sur le bouton "tous les épisodes de l'organisation" dans la page d'un épisode
+ * 30.0.86 Podcastmaker newest
+ * 30.0.87 Podcastmaker newest (swiper list)
+ * 30.0.88 Podcastmaker newest (swiper list)
 
  * 31.0.0 Passage en 31
  * 31.0.1 Ajout pocket casts
@@ -609,4 +613,6 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 31.0.24 Amélioration accessibilité
  * 31.0.25 Erreur audioUrl
  * 31.0.26 Erreur 403 page expose 
-
+ * 31.0.27 Snackbar chose holdtime
+ * 31.0.28 Mixins orgComputed
+ * 31.0.29 Changement css

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "31.0.26",
+  "version": "31.0.29",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",
@@ -28,6 +28,7 @@
     "qrcode.vue": "^3.3.3",
     "sass": "^1.49.11",
     "sass-loader": "^12.6.0",
+    "swiper": "^8.1.5",
     "v-calendar": "^3.0.0-alpha.8",
     "vue": "^3.2.31",
     "vue-i18n": "^9.2.0-beta.34",

package/src/assets/bootstrap-diff.scss

@@ -27,38 +27,6 @@
         &:hover{
           background: rgba($octopus-primary-color, 0.3) ;
         }
-        // Button Primary
-        &.btn-primary {
-            background: $octopus-third-color;
-            background: -moz-linear-gradient(-45deg, $octopus-third-color 0%, $octopus-primary-linear-background 100%);
-            background: -webkit-gradient(left top, right bottom, color-stop(0%, $octopus-third-color), color-stop(100%, $octopus-primary-linear-background));
-            background: -webkit-linear-gradient(-45deg, $octopus-third-color 0%, $octopus-primary-linear-background 100%);
-            background: -o-linear-gradient(-45deg, $octopus-third-color 0%, $octopus-primary-linear-background 100%);
-            background: -ms-linear-gradient(-45deg, $octopus-third-color 0%, $octopus-primary-linear-background 100%);
-            background: linear-gradient(135deg, $octopus-third-color 0%, $octopus-primary-linear-background 100%);
-            filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#d6d91f', endColorstr='#50b685', GradientType=1 );
-            border-radius: 50px;
-            height: auto;
-            border: 0;
-            color: black !important;
-            &:focus,
-            &:hover {
-            background:$octopus-third-color;
-                background: -moz-linear-gradient(-45deg, darken($octopus-third-color,7%) 0%, darken($octopus-primary-linear-background, 7%) 100%);
-                background: -webkit-gradient(left top, right bottom, color-stop(0%, darken($octopus-third-color,7%)), color-stop(100%, darken($octopus-primary-linear-background, 7%)));
-                background: -webkit-linear-gradient(-45deg, darken($octopus-third-color,7%) 0%, darken($octopus-primary-linear-background, 7%) 100%);
-                background: -o-linear-gradient(-45deg, darken($octopus-third-color,7%) 0%, darken($octopus-primary-linear-background, 7%) 100%);
-                background: -ms-linear-gradient(-45deg, darken($octopus-third-color,7%) 0%, darken($octopus-primary-linear-background, 7%) 100%);
-                background: linear-gradient(135deg, darken($octopus-third-color,7%) 0%, darken($octopus-primary-linear-background, 7%) 100%);
-                filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#d6d91f', endColorstr='#4fcf91', GradientType=1 );
-                border: 0;
-            }
-            &:active,
-            &.active {
-                background: darken($octopus-primary-linear-background, 4%);
-                border-color: darken($octopus-primary-linear-background, 7%);
-            }
-        }
         //Button disable halo after click
         &.btn-underline{
             background: none;
@@ -74,12 +42,13 @@
             }
         }
     
-        &.btn-link {
+        &.btn-primary {
             display: flex;
             align-items: center;
             justify-content: center;
             background: $octopus-primary-dark;
-            border: 2px solid $octopus-primary-dark;
+            border: 1px solid $octopus-primary-dark;
+            border-radius: 4px !important;
             color: white;
             font-weight: bold;
             &:focus,

package/src/assets/general.scss

@@ -95,7 +95,6 @@ body{
   .page-box{
     background-color: $octopus-background;
     padding: 2rem 5rem 5rem 6rem;
-    border-radius: 2rem 2rem 0 0;
     @media (max-width: 1400px) {
       padding: 2rem;
     }

package/src/assets/share.scss

@@ -233,5 +233,8 @@
     @media (max-width: 960px) {
       width: 200px;
     }
+    @media (max-width: 200px) {
+      width: 90%;
+    }
   }
 }

package/src/components/display/comments/AddCommentModal.vue

@@ -53,7 +53,7 @@
           </button>
           <button
             v-if="!sending"
-            class="btn btn-link m-1"
+            class="btn btn-primary m-1"
             :disabled="0 === countName || !validName"
             @click="validateName"
           >

package/src/components/display/comments/CommentInput.vue

@@ -33,7 +33,7 @@
         {{ $t('Cancel') }}
       </button>
       <button
-        class="btn btn-link m-1"
+        class="btn btn-primary m-1"
         :disabled="0 === countName || !validName"
         @click="validEdit"
       >
@@ -64,7 +64,7 @@
           {{ $t('Cancel') }}
         </button>
         <button
-          class="btn btn-link"
+          class="btn btn-primary"
           :disabled="0 === countComment || !validComment"
           @mousedown="requestToSend"
         >

package/src/components/display/comments/CommentItem.vue

@@ -39,7 +39,7 @@
           {{ $t('Cancel') }}
         </button>
         <button
-          class="btn btn-link m-1"
+          class="btn btn-primary m-1"
           :disabled="0 === countComment || !validComment || 0 === countName || !validName"
           @click="validEdit"
         >

package/src/components/display/comments/CommentList.vue

@@ -25,7 +25,7 @@
     </transition-group>
     <button
       v-show="!allFetched && (!loading || 0!==first)"
-      class="btn btn-link mt-2"
+      class="btn btn-primary mt-2"
       :class="comId ? 'align-self-start' : 'align-self-center'"
       :disabled="loading"
       :title="$t('See more comments')"

package/src/components/display/emission/EmissionInlineList.vue

@@ -57,7 +57,7 @@
     </transition-group>
     <router-link
       :to="href"
-      class="btn btn-link align-self-center width-fit-content m-4"
+      class="btn btn-primary align-self-center width-fit-content m-4"
     >
       {{
         buttonText

package/src/components/display/emission/EmissionList.vue

@@ -41,7 +41,7 @@
       <button
         v-show="!allFetched"
         class="btn"
-        :class="buttonPlus ? 'btn-link align-self-center width-fit-content m-4' : 'btn-more'"
+        :class="buttonPlus ? 'btn-primary align-self-center width-fit-content m-4' : 'btn-more'"
         :disabled="loading"
         :title="$t('See more')"
         @click="fetchContent(false)"

package/src/components/display/live/LiveHorizontalList.vue

@@ -16,7 +16,7 @@
     <button
       v-show="!allFetched"
       class="btn"
-      :class="buttonPlus ? 'btn-link align-self-center width-fit-content m-4 mt-3' : 'btn-more'"
+      :class="buttonPlus ? 'btn-primary align-self-center width-fit-content m-4 mt-3' : 'btn-more'"
       :disabled="inFetching"
       :title="$t('See more')"
       @click="displayMore"

package/src/components/display/playlist/PlaylistList.vue

@@ -19,7 +19,7 @@
     <button
       v-show="!allFetched && loaded"
       class="btn"
-      :class="buttonPlus ? 'btn-link align-self-center width-fit-content m-4':'btn-more'"
+      :class="buttonPlus ? 'btn-primary align-self-center width-fit-content m-4':'btn-more'"
       :disabled="inFetching"
       :title="$t('See more')"
       @click="displayMore"

package/src/components/display/playlist/PodcastList.vue

@@ -40,7 +40,7 @@
     <button
       v-show="size < podcasts.length && loaded"
       class="btn"
-      :class="buttonPlus ? 'btn-link align-self-center width-fit-content m-4':'btn-more'"
+      :class="buttonPlus ? 'btn-primary align-self-center width-fit-content m-4':'btn-more'"
       :title="$t('See more')"
       @click="displayMore"
     >

package/src/components/display/playlist/PodcastPlaylistInlineList.vue

@@ -47,7 +47,7 @@
       />
     </transition-group>
     <router-link
-      class="btn btn-link align-self-center width-fit-content m-4"
+      class="btn btn-primary align-self-center width-fit-content m-4"
       :to="{
         name: 'playlist',
         params: { playlistId: playlistId.toString() },

package/src/components/display/podcasts/PodcastImage.vue

@@ -237,6 +237,9 @@ export default defineComponent({
           'PENDING' === this.fetchConference.status)
       );
     },
+    clickPlayGoPage():boolean{
+      return (state.podcastPage.clickPlayGoPage as boolean);
+    },
   },
   watch: {
     arrowDirection(): void {
@@ -265,16 +268,19 @@ export default defineComponent({
       }
       if (!this.recordingLive) {
         this.$store.commit('playerPlayPodcast', this.podcast);
-        return;
+      }else{
+        this.$store.commit('playerPlayPodcast', {
+          title: this.podcast.title,
+          audioUrl: this.podcast.audioUrl,
+          duration: this.podcast.duration,
+          conferenceId: this.fetchConference ? this.fetchConference.conferenceId : undefined,
+          livePodcastId: this.podcast.podcastId,
+          organisation: this.podcast.organisation,
+        });
+      }
+      if(this.clickPlayGoPage){
+        this.$router.push('/main/pub/podcast/'+this.podcast.podcastId);
       }
-      this.$store.commit('playerPlayPodcast', {
-        title: this.podcast.title,
-        audioUrl: this.podcast.audioUrl,
-        duration: this.podcast.duration,
-        conferenceId: this.fetchConference ? this.fetchConference.conferenceId : undefined,
-        livePodcastId: this.podcast.podcastId,
-        organisation: this.podcast.organisation,
-      });
     },
     showDescription(): void {
       if (this.isDescription) {

package/src/components/display/podcasts/PodcastInlineList.vue

@@ -1,108 +1,52 @@
 <template>
-  <div
-    v-if="loading || (!loading && 0 !== allPodcasts.length)"
-    class="d-flex flex-column p-3"
-  >
-    <h2>{{ title }}</h2>
-    <div class="d-flex justify-content-between">
-      <div class="d-flex">
-        <button
-          class="btn btn-underline"
-          :class="{ active: !popularSort }"
-          @click="sortChrono()"
-        >
-          {{ $t('Last added') }}
-        </button>
-        <button
-          class="btn btn-underline"
-          :class="{ active: popularSort }"
-          @click="sortPopular()"
-        >
-          {{ $t('Most popular') }}
-        </button>
-      </div>
-      <div
-        v-if="!isArrow && !overflowScroll"
-        class="hide-phone"
-      >
-        <button
-          class="btn admin-button m-1"
-          :class="{ disabled: !previousAvailable }"
-          :title="$t('Display previous')"
-          @click="displayPrevious()"
-        >
-          <div class="saooti-left fw-bold" />
-        </button>
-        <button
-          class="btn admin-button m-1"
-          :class="{ disabled: !nextAvailable }"
-          :title="$t('Display next')"
-          @click="displayNext()"
-        >
-          <div class="saooti-right fw-bold" />
-        </button>
-      </div>
-    </div>
-    <ClassicLoading
-      :loading-text="loading?$t('Loading podcasts ...'):undefined"
-    />
-    <transition-group
-      v-show="loaded"
-      :name="transitionName"
-      class="element-list-inline"
-      tag="ul"
-      :class="[
-        alignLeft ? 'justify-content-start' : '',
-        overflowScroll ? 'overflowScroll' : '',
-      ]"
-      :css="isInlineAnimation"
-    >
-      <PodcastItem
-        v-for="p in podcasts"
-        :key="p.podcastId"
-        class="flex-shrink-0 item-phone-margin"
-        :podcast="p"
-        :class="[alignLeft ? 'me-3' : '']"
-      />
-    </transition-group>
-    <router-link
-      class="btn btn-link align-self-center width-fit-content m-4"
-      :to="refTo"
-      @click="handleSeeMoreButton"
-    >
-      {{ buttonText }}
-      <div
-        v-if="buttonPlus"
-        class="ms-1 saooti-more"
-      />
-    </router-link>
-  </div>
+  <PodcastInlineListClassic
+    v-if="listTypeClassic"
+    :organisation-id="organisationId"
+    :emission-id="emissionId"
+    :iab-id="iabId"
+    :title="title"
+    :href="href"
+    :button-text="buttonText"
+    :is-arrow="isArrow"
+    :require-popular-sort="requirePopularSort"
+    :button-plus="buttonPlus"
+    :rubrique-id="rubriqueId"
+    :rubriquage-id="rubriquageId"
+    :no-rubriquage-id="noRubriquageId"
+    :query="query"
+    @update:isArrow="$emit('update:isArrow',$event)"
+  />
+  <PodcastSwiperList
+    v-else
+    :organisation-id="organisationId"
+    :emission-id="emissionId"
+    :iab-id="iabId"
+    :title="title"
+    :href="href"
+    :button-text="buttonText"
+    :is-arrow="isArrow"
+    :require-popular-sort="requirePopularSort"
+    :button-plus="buttonPlus"
+    :rubrique-id="rubriqueId"
+    :rubriquage-id="rubriquageId"
+    :no-rubriquage-id="noRubriquageId"
+    :query="query"
+    @update:isArrow="$emit('update:isArrow',$event)"
+  />
 </template>
 
 <script lang="ts">
-import { handle403 } from '../../mixins/handle403';
-import octopusApi from '@saooti/octopus-api';
-import domHelper from '../../../helper/dom';
-import PodcastItem from './PodcastItem.vue';
-import ClassicLoading from '../../form/ClassicLoading.vue';
-const PHONE_WIDTH = 960;
 import { state } from '../../../store/paramStore';
-import { Podcast } from '@/store/class/general/podcast';
-import { RubriquageFilter } from '@/store/class/rubrique/rubriquageFilter';
-import { defineComponent } from 'vue'
-import { RouteLocationRaw } from 'vue-router';
-import { AxiosError } from 'axios';
-import { Rubrique } from '@/store/class/rubrique/rubrique';
+import { defineAsyncComponent, defineComponent } from 'vue';
+const PodcastInlineListClassic = defineAsyncComponent(() => import('./PodcastInlineListClassic.vue'));
+const PodcastSwiperList = defineAsyncComponent(() => import('./PodcastSwiperList.vue'));
 export default defineComponent({
   name: 'PodcastInlineList',
   
   components: {
-    PodcastItem,
-    ClassicLoading
+    PodcastInlineListClassic,
+    PodcastSwiperList,
   },
-
-  mixins: [handle403],
-
   props: {
     organisationId: { default: undefined, type: String},
     emissionId: { default: undefined, type: Number},
@@ -119,220 +63,10 @@ export default defineComponent({
     query: { default: undefined, type: String},
   },
   emits: ['update:isArrow'],
-
-  data() {
-    return {
-      loading: true as boolean,
-      loaded: true as boolean,
-      index: 0 as number,
-      first: 0 as number,
-      size: 5 as number,
-      totalCount: 0 as number,
-      popularSort: false as boolean,
-      allPodcasts: [] as Array<Podcast>,
-      direction: 1 as number,
-      alignLeft: false as boolean,
-    };
-  },
-  computed: {
-    podcasts(): Array<Podcast> {
-      return this.allPodcasts.slice(this.index, this.index + this.size);
-    },
-    sizeItem(): number {
-      return state.generalParameters.podcastItem ? (state.generalParameters.podcastItem as number): 13;
-    },
-    overflowScroll(): boolean {
-      return (state.emissionPage.overflowScroll as boolean);
-    },
-    isInlineAnimation(): boolean {
-      return (state.generalParameters.isInlineAnimation as boolean);
-    },
-    filterOrga(): string {
-      return this.$store.state.filter.organisationId;
-    },
-    organisation(): string|undefined {
-      if (this.organisationId) return this.organisationId;
-      if (this.filterOrga) return this.filterOrga;
-      return undefined;
+  computed:{
+    listTypeClassic(): boolean {
+      return (state.podcastPage.listTypeClassic as boolean);
     },
-    rubriqueQueryParam(): string|undefined{
-      if(this.$store.state.filter && this.$store.state.filter.rubriqueFilter && this.$store.state.filter.rubriqueFilter.length){
-        return this.$store.state.filter.rubriqueFilter.map((value: RubriquageFilter) =>  value.rubriquageId+':'+value.rubriqueId).join();
-      }
-      return undefined;
-    },
-    refTo(): string | RouteLocationRaw {
-      if (this.href) return this.href;
-      if(this.iabId){
-        return {
-          name: 'category',
-          params:{ 'iabId': this.iabId },
-          query: { productor: this.$store.state.filter.organisationId },
-        };
-      }
-      return {
-          name: 'podcasts',
-          query: { productor: this.$store.state.filter.organisationId, 
-                  iabId: this.$store.state.filter.iab ? this.$store.state.filter.iab.id : undefined,
-                  rubriquesId: this.rubriqueQueryParam },
-        };
-    },
-    previousAvailable(): boolean {
-      return this.index > 0;
-    },
-    nextAvailable(): boolean {
-      return this.index + this.size < this.totalCount;
-    },
-    transitionName(): string {
-      return this.direction > 0 ? 'out-left' : 'out-right';
-    },
-    watchVariable():string{
-      return `${this.emissionId}|${this.organisationId}|${this.filterOrga}|${this.iabId}|${this.rubriqueId}|${this.rubriquageId}|${this.query}`;
-    }
-  },
-  watch: {
-    watchVariable(): void {
-      this.reset();
-      this.fetchNext();
-    },
-  },
-  
-  created() {
-    if (undefined !== this.requirePopularSort) {
-      this.popularSort = this.requirePopularSort;
-    }
-    if (undefined !== this.isArrow) {
-      this.$emit('update:isArrow', true);
-    }
-    window.addEventListener('resize', this.handleResize);
-  },
-
-  unmounted() {
-    window.removeEventListener('resize', this.handleResize);
-  },
-
-  mounted() {
-    this.handleResize();
-    this.fetchNext();
-  },
-  methods: {
-    handleSeeMoreButton(event: { preventDefault: () => void; }){
-      if(!this.rubriqueId || this.noRubriquageId.length){
-        return;
-      }
-      event.preventDefault();
-      const rubriqueChosenId = this.rubriqueId[this.rubriqueId.length - 1];
-      let filterToAdd: RubriquageFilter = {
-        rubriquageId: 0, 
-        rubriqueId: rubriqueChosenId, 
-        nameRubriquage:  '',
-        nameRubrique: ''
-      };
-      if(this.$store.state.filter.rubriquageArray.length){
-        const rubriqueChosen =  this.$store.state.filter.rubriquageArray[this.rubriqueId.length - 1].rubriques.find((element: Rubrique) => element.rubriqueId === rubriqueChosenId);
-        filterToAdd = {
-          rubriquageId: this.$store.state.filter.rubriquageArray[this.rubriqueId.length - 1].rubriquageId, 
-          rubriqueId: rubriqueChosenId, 
-          nameRubriquage:  this.$store.state.filter.rubriquageArray[this.rubriqueId.length - 1].title,
-          nameRubrique: rubriqueChosen.name
-        };
-      }
-      const newFilter: Array<RubriquageFilter> = Array.from(this.$store.state.filter.rubriqueFilter);
-      newFilter.push(filterToAdd);
-      this.$store.commit('filterRubrique', newFilter);
-      const queries = this.$route.query;
-      const queryString = newFilter.map(value =>  value.rubriquageId+':'+value.rubriqueId).join();
-      this.$router.push({ name: 'podcasts',query: { ...queries, ...{ rubriquesId: queryString }} });
-    },
-    async fetchNext(): Promise<void> {
-      try {
-        const data = await octopusApi.fetchPodcasts({
-          first: this.first,
-          size: this.size + 1,
-          organisationId: this.organisation,
-          emissionId: this.emissionId,
-          iabId: this.iabId,
-          rubriqueId: this.rubriqueId.length ?this.rubriqueId:undefined,
-          rubriquageId: this.rubriquageId.length ?this.rubriquageId : undefined,
-          noRubriquageId: this.noRubriquageId.length ? this.noRubriquageId : undefined,
-          sort: this.popularSort ? 'POPULARITY' : 'DATE',
-          query: this.query,
-        });
-        this.loading = false;
-        this.loaded = true;
-        this.totalCount = data.count;
-        if (this.allPodcasts.length + data.result.length < this.totalCount) {
-          const nexEl = data.result.pop() as Podcast;
-          this.preloadImage(nexEl.imageUrl?nexEl.imageUrl:'');
-        }
-        this.allPodcasts = this.allPodcasts.concat(
-          data.result.filter((pod: Podcast|null) => null !== pod)
-        );
-        if (this.allPodcasts.length <= 3) {
-          this.alignLeft = true;
-        } else {
-          this.alignLeft = false;
-        }
-        this.first += this.size;
-      } catch (error) {
-        this.handle403((error as AxiosError));
-      }
-    },
-    displayPrevious(): void {
-      this.direction = -1;
-      if (this.previousAvailable) {
-        this.index -= 1;
-      }
-    },
-    displayNext(): void {
-      this.direction = 1;
-      if (!this.nextAvailable) return;
-      if (
-        this.first - (this.index + this.size) < 2 &&
-        this.allPodcasts.length < this.totalCount
-      ) {
-        this.fetchNext();
-      }
-      this.index += 1;
-    },
-    handleResize(): void {
-      if (!this.$el) return;
-      if (this.overflowScroll) {
-        this.size = 20;
-        return;
-      }
-      if (window.innerWidth <= PHONE_WIDTH) {
-        this.size = 10;
-        return;
-      }
-      const width = (this.$el as HTMLElement).offsetWidth;
-      const sixteen = domHelper.convertRemToPixels(this.sizeItem + 0.7);
-      this.size = Math.floor(width / sixteen);
-    },
-    sortPopular(): void {
-      if (this.popularSort) return;
-      this.popularSort = true;
-      this.reset();
-      this.fetchNext();
-    },
-    sortChrono(): void {
-      if (!this.popularSort) return;
-      this.popularSort = false;
-      this.reset();
-      this.fetchNext();
-    },
-    reset(): void {
-      this.loading = true;
-      this.loaded = true;
-      this.index = 0;
-      this.first = 0;
-      this.totalCount = 0;
-      this.allPodcasts.length = 0;
-    },
-    preloadImage(url: string): void {
-      const img = new Image();
-      img.src = url;
-    },
-  },
+  }
 })
 </script>