@saooti/octopus-sdk 30.0.19 → 30.0.23

package/src/components/misc/HomeDropdown.vue

@@ -1,105 +1,97 @@
 <template>
   <div
-    class="top-bar-dropdown"
+    class="d-flex align-items-center"
   >
-    <div
+    <button
       v-if="authenticated"
-      class="dropdown split-dropdown btn-group"
+      class="btn btn-primary m-1"
+      @click="goToUrl('/main/priv/backoffice')"
+    >
+      {{ $t('My space') }}
+    </button>
+    <div
+      class="dropdown btn-group"
     >
       <button
-        class="btn btn-primary main-button-dropdown"
-        @click="goToUrl('/main/priv/backoffice')"
-      >
-        {{ $t('My space') }}
-      </button>
-      <button
-        class="btn dropdown-toggle btn-primary data-selenium-dropdown-topbar dropdown-toggle-split"
+        class="btn dropdown-toggle m-1 admin-button dropdown-toggle-no-caret saooti-user-octopus"
         data-bs-toggle="dropdown"
         aria-expanded="false"
+        :title="$t('User menu')"
       />
       <div class="dropdown-menu dropdown-menu-right px-4">
-        <router-link
-          v-if="isContribution && !isPodcastmaker"
-          class="btn btn-primary w-100"
-          to="/main/priv/upload"
-        >
-          {{ $t('Upload') }}
-        </router-link>
-        <template v-if="!isPodcastmaker">
-          <router-link
-            to="/main/priv/backoffice"
-            class="show-phone dropdown-item"
-          >
-            {{ $t('My space') }}
-          </router-link>
-          <router-link
+        <template v-if="!authenticated">
+          <a
             class="dropdown-item"
-            to="/main/priv/edit/profile"
+            href="/sso/login"
           >
-            {{ $t('Edit my profile') }}
-          </router-link>
+            {{ $t('Login') }}
+          </a>
           <router-link
-            v-if="isOrganisation"
+            v-if="!isPodcastmaker"
             class="dropdown-item"
-            to="/main/priv/edit/organisation"
+            to="/main/pub/create"
           >
-            {{ $t('Edit my organisation') }}
+            {{ $t('Create an account') }}
           </router-link>
         </template>
-        <template v-if="!isEducation">
-          <hr class="dropdown-divider">
-          <a
-            href="https://help.octopus.saooti.com/Aide/"
-            class="dropdown-item"
-            rel="noopener"
-            target="_blank"
-          >
-            {{ $t('Help') }}
-          </a>
-          <a
-            href="https://help.octopus.saooti.com/"
-            class="dropdown-item"
-            rel="noopener"
-            target="_blank"
-          >
-            {{ $t('TutoMag') }}
-          </a>
-          <hr class="dropdown-divider">
-          <a
-            class="dropdown-item"
-            href="/sso/logout"
+        <template v-else>
+          <router-link
+            v-if="isContribution && !isPodcastmaker"
+            class="btn btn-primary w-100"
+            to="/main/priv/upload"
           >
-            {{ $t('Logout') }}
-          </a>
+            {{ $t('Upload') }}
+          </router-link>
+          <template v-if="!isPodcastmaker">
+            <router-link
+              to="/main/priv/backoffice"
+              class="show-phone dropdown-item"
+            >
+              {{ $t('My space') }}
+            </router-link>
+            <router-link
+              class="dropdown-item"
+              to="/main/priv/edit/profile"
+            >
+              {{ $t('Edit my profile') }}
+            </router-link>
+            <router-link
+              v-if="isOrganisation"
+              class="dropdown-item"
+              to="/main/priv/edit/organisation"
+            >
+              {{ $t('Edit my organisation') }}
+            </router-link>
+          </template>
+          <template v-if="!isEducation">
+            <hr class="dropdown-divider">
+            <a
+              href="https://help.octopus.saooti.com/Aide/"
+              class="dropdown-item"
+              rel="noopener"
+              target="_blank"
+            >
+              {{ $t('Help') }}
+            </a>
+            <a
+              href="https://help.octopus.saooti.com/"
+              class="dropdown-item"
+              rel="noopener"
+              target="_blank"
+            >
+              {{ $t('TutoMag') }}
+            </a>
+            <hr class="dropdown-divider">
+            <a
+              class="dropdown-item"
+              href="/sso/logout"
+            >
+              {{ $t('Logout') }}
+            </a>
+          </template>
         </template>
       </div>
     </div>
-    <div
-      v-else
-      class="dropdown btn-group"
-    >
-      <button
-        class="btn dropdown-toggle m-1 admin-button dropdown-toggle-no-caret saooti-user-octopus"
-        data-bs-toggle="dropdown"
-        aria-expanded="false"
-        title="Profile"
-      />
-      <div class="dropdown-menu dropdown-menu-right px-4">
-        <a
-          class="dropdown-item"
-          href="/sso/login"
-        >
-          {{ $t('Login') }}
-        </a>
-        <router-link
-          v-if="!isPodcastmaker"
-          class="dropdown-item"
-          to="/main/pub/create"
-        >
-          {{ $t('Create an account') }}
-        </router-link>
-      </div>
-    </div>
   </div>
 </template>
 
@@ -136,37 +128,4 @@ export default defineComponent({
     },
   },
 })
-</script>
-
-<style lang="scss">
-.top-bar-dropdown {
-  display: flex;
-  align-items: center;
-
-  .main-button-dropdown {
-    padding-bottom: 0.4rem;
-    width: 140px;
-    text-align: left;
-    padding-left: 15px;
-    margin-right: 30px;
-    @media (max-width: 650px) {
-      display: none;
-    }
-  }
-  .btn-group .dropdown-toggle-split {
-    align-items: center;
-    border-radius: 50%;
-    width: 40px !important;
-    height: 40px !important;
-    justify-content: center;
-    position: absolute;
-    right: 5px;
-    border: 4px solid white !important;
-    z-index: 2;
-    @media (max-width: 650px) {
-      position: relative;
-      right: auto;
-    }
-  }
-}
-</style>
+</script>

package/src/components/misc/PlayerButtons.vue

@@ -23,7 +23,7 @@
     />
   </div>
   <div
-    v-if="(isPlaying || isPaused) && (media || isStop)"
+    v-if="isPlaying || isPaused"
     class="play-button-box primary-bg text-light"
     @click="stopPlayer"
   >
@@ -61,9 +61,6 @@ export default defineComponent({
       if (this.$store.state.player.podcast) return this.$store.state.player.podcast.imageUrl;
       return '';
     },
-    isStop(): boolean{
-      return this.$store.state.player.stop;
-    },
     media(): undefined|Media{
       return this.$store.state.player.media;
     },

package/src/components/misc/TopBar.vue

@@ -34,7 +34,7 @@
       :reset="reset"
       @selected="onOrganisationSelected"
     />
-    <div class="d-flex justify-content-center flex-grow-1">
+    <div class="d-flex justify-content-end flex-grow-1">
       <router-link
         v-if="
           isLiveTab &&
@@ -101,7 +101,7 @@
     </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>
+        <span>{{ $t('Hosted by') }}</span><span class="ms-1 me-1 primary-darker">Saooti</span>
       </div>
       <div class="d-flex justify-content-end flex-nowrap">
         <HomeDropdown :is-education="isEducation" />

package/src/components/misc/modal/MessageModal.vue

@@ -32,7 +32,7 @@
         >
           <button
             v-if="canceltext"
-            class="btn btn-light m-1"
+            class="btn m-1"
             @click="onCancel"
           >
             {{ canceltext }}
@@ -86,6 +86,4 @@ export default defineComponent({
     },
   },
 })
-</script>
-
-<style lang="scss"></style>
+</script>

package/src/components/misc/modal/QrCodeModal.vue

@@ -84,6 +84,4 @@ export default defineComponent({
     },
   }
 })
-</script>
-
-<style lang="scss"></style>
+</script>

package/src/components/pages/Emission.vue

@@ -233,12 +233,8 @@ export default defineComponent({
         this.$emit('emissionTitle', this.name);
         this.loaded = true;
         if (!this.emission.annotations) return;
-        if (this.emission.annotations.RSS) {
-          this.rssEmission = true;
-        }
-        if (this.emission.annotations.FTP) {
-          this.ftpEmission = true;
-        }
+        this.rssEmission = this.emission.annotations.RSS? true: false;
+        this.ftpEmission = this.emission.annotations.FTP? true: false;
         if (this.emission.annotations.exclusive) {
           this.exclusive =
             'true' === this.emission.annotations.exclusive ? true : false;

package/src/components/pages/Rubrique.vue

@@ -49,6 +49,4 @@ export default defineComponent({
     },
   },
 })
-</script>
-
-<style lang="scss"></style>
+</script>

package/src/locale/en.ts

@@ -295,4 +295,6 @@ export default{
   "Download":"Download",
   "Download started": 'Download started',
   'From RSS': "From an RSS feed",
+  "User menu":"User menu",
+  'Podcast tags': 'Podcast tags',
 };

package/src/locale/fr.ts

@@ -295,4 +295,6 @@ export default{
   "Download":"Télécharger",
   "Download started": 'Téléchargement lancé',
   'From RSS': "Issu d'un flux RSS",
+  "User menu":"Menu utilisateur",
+  'Podcast tags': "Mot-clé de l'épisode",
 };

package/src/sass/_variables.scss

@@ -5,7 +5,7 @@ $body-bg: #f8fafc;
 $font-family-sans-serif: 'Roboto', sans-serif;
 $font-size-base: 0.9rem;
 $line-height-base: 1.6;
-$primary: #40a372;
+$primary: #32815C;
 
 // Colors
 $blue: #3490dc;
@@ -20,13 +20,16 @@ $teal: #4dc0b5;
 $cyan: #6cb2eb;
 
 //Octopus style
-$octopus-background: #f3f3f3;
-$octopus-secondary-background: #fafafa;
+$octopus-background: #fafafa;
 $octopus-primary-color: #40a372;
 $octopus-secondary-color : #ddd;
-$octopus-light-secondary-color: #eee;
-$octopus-third-color: rgba(214,217,31,1);
-$octopus-primary-dark : #48a879;
-$primaryColorReallyTransparent : #a2f3c993;
+$octopus-primary-linear-background: #7fd8ab;
+$octopus-third-color: #fdff7b;
+$octopus-primary-dark : #32815C;
+$primaryColorReallyTransparent : #05050593;
+
+$primaryColorTransparent : #40a37193;
+$primaryColorMoreTransparent : #40a37154;
+$primaryColorReallyTransparent : #cef7e250;
 
 

package/src/store/AppStore.ts

@@ -17,9 +17,6 @@ export default createStore({
         };
         return;
       }
-      if (podcast.isStop) {
-        state.player.stop = true;
-      }
       if (
         (state.player.podcast &&
           state.player.podcast.podcastId === podcast.podcastId) ||

package/src/store/typeAppStore.ts

@@ -199,7 +199,6 @@ export function emptyPodcastData(): Podcast{
             total: 0,
             media: undefined ,
             live: undefined ,
-            stop: undefined ,
           },
       
           navigator: {