@saooti/octopus-sdk 30.0.2 → 30.0.3

package/README.md

@@ -498,3 +498,4 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 
  * 30.0.1 Nouveau sprint
  * 30.0.2 Correction css
+ * 30.0.3 Ajout tag page podcast

package/index.ts

@@ -55,6 +55,7 @@ import {cookies} from "./src/components/mixins/functions";
 import {displayMethods} from "./src/components/mixins/functions";
 import {orgaFilter} from "./src/components/mixins/organisationFilter";
 import {initSDK} from "./src/components/mixins/init";
+import {tagOfMixins} from "./src/components/mixins/tagOfMixins";
 
 const components = {
     Lives,
@@ -97,7 +98,8 @@ const components = {
     CategoryFilter,
     orgaFilter,
     initSDK,
-    Popover
+    Popover,
+    tagOfMixins
 }
 
 export default components;
@@ -143,5 +145,6 @@ export {
     CategoryFilter,
     orgaFilter,
     initSDK,
-    Popover
+    Popover,
+    tagOfMixins
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "30.0.2",
+  "version": "30.0.3",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",

package/public/img/ouest_france_logo.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 41.1 41.2" style="enable-background:new 0 0 41.1 41.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#E2001A;}
+</style>
+<g>
+	<path class="st0" d="M28.1,1.5v13.3H12.7v-2h13.4v-12C15.1-2.3,3.8,4.1,0.7,15.1c-2.8,10,2.3,20.6,12,24.6V26.5h15.4v2H14.7v11.9
+		c10.9,3.2,22.4-3,25.6-13.9C43.3,16.3,38,5.4,28.1,1.5z"/>
+</g>
+</svg>

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

@@ -146,7 +146,6 @@
       </div>
     </div>
     <TagList
-      v-if="isTagList"
       :tag-list="podcast.tags"
     />
   </div>
@@ -155,6 +154,7 @@
 <script lang="ts">
 import PodcastImage from './PodcastImage.vue';
 import ParticipantDescription from './ParticipantDescription.vue';
+import TagList from './TagList.vue';
 import { state } from '../../../store/paramStore';
 import moment from 'moment';
 // @ts-ignore
@@ -165,7 +165,6 @@ import { Conference } from '@/store/class/conference';
 
 import { defineComponent, defineAsyncComponent } from 'vue';
 const ShareButtons = defineAsyncComponent(() => import('../sharing/ShareButtons.vue'));
-const TagList = defineAsyncComponent(() => import('./TagList.vue'));
 const ErrorMessage = defineAsyncComponent(() => import('../../misc/ErrorMessage.vue'));
 export default defineComponent({
   name: "PodcastModuleBox",
@@ -205,9 +204,6 @@ export default defineComponent({
     isOuestFrance(): boolean {
       return (state.podcastPage.ouestFranceStyle as boolean);
     },
-    isTagList(): boolean {
-      return (state.podcastPage.tagList as boolean);
-    },
     isDownloadButton(): boolean {
       return (state.podcastPage.downloadButton as boolean);
     },

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

@@ -1,55 +1,67 @@
 <template>
-  <div v-if="undefined !== tagList">
-    <ul class="d-flex flex-wrap">
-      <li
-        v-for="tag in tagList"
-        :key="tag"
-        class="tagListElement"
+  <div
+    v-if="undefined !== tagList"
+    class="tag-list-component d-flex flex-wrap"
+  >
+    <div
+      v-for="(tag, index) in tagList"
+      :key="tag"
+      class="tagListElement"
+    >
+      <div
+        :id="'tag-list-from-podcast-page'+index"
+        class="tagListLink"
       >
-        <router-link
-          :to="{
-            name: 'search',
-            query: {
-              query: tag,
-              productor: $store.state.filter.organisationId,
-            },
-          }"
-          class="tagListLink"
+        <img
+          v-if="isOuestFranceTag(tag)"
+          class="ouest-france-logo"
+          src="/img/ouest_france_logo.svg"
         >
-          {{ tag }}
-        </router-link>
-      </li>
-    </ul>
+        {{ formateOfTag(tag) }}
+      </div>
+      <Popover
+        v-if="isOuestFranceTag(tag)"
+        :target="'tag-list-from-podcast-page'+index"
+        triggers="hover"
+        :content="tag.substring(4,tag.length)"
+        placement="bottom"
+      />
+    </div>
   </div>
 </template>
 
 <script lang="ts">
+import Popover from '../../misc/Popover.vue';
+import { tagOfMixins } from '../../mixins/tagOfMixins';
 import { defineComponent } from 'vue'
 export default defineComponent({
   name: 'TagList',
-  components: {},
+  components: {
+    Popover
+  },
   props: {
     tagList: { default: () => [], type: Array as ()=>Array<string>},
   },
+  mixins:[tagOfMixins],
 
-  methods: {},
+  methods: {
+  },
 })
 </script>
 
 <style lang="scss">
-.tagListElement {
-  display: flex;
-  margin: 0.4rem;
-  padding: 0.8rem;
-  border: 1px solid #999;
-  cursor: pointer;
-}
-.tagListLink {
-  font-weight: 700;
-  font-size: 1.2rem;
-  color: #666;
-  &:hover {
-    color: #666;
+.tag-list-component{
+  .ouest-france-logo{
+    width: 20px;
+    height: 20px;
+    margin-right: 5px;
+  }
+  .tagListElement {
+    display: flex;
+    margin: 0.4rem;
+    padding: 0.2rem;
+    border: 1px solid #999;
+    border-radius: 0.5rem;
   }
 }
 </style>

package/src/components/mixins/tagOfMixins.ts

@@ -0,0 +1,19 @@
+import {defineComponent } from 'vue';
+export const tagOfMixins =  defineComponent({
+  name: 'TagOfMixins',
+	methods:{
+    isOuestFranceTag(tag: string): boolean{
+      return "[of]"===tag.substring(0,4);
+    },
+    formateOfTag(tag: string): string{
+      if(!this.isOuestFranceTag(tag)){
+        return tag;
+      }
+      const lastSlash = tag.lastIndexOf('/');
+      if(-1!==lastSlash){
+        return tag.substring(lastSlash + 1, tag.length);
+      }
+      return tag.substring(4, tag.length);
+    },
+	}
+});

package/src/store/paramStore.ts

@@ -12,7 +12,7 @@ const state:paramStore = {
     isPlaylist: false,
     isProduction: true,
     isContribution: true,
-    ApiUri: 'https://api.staging.saooti.org/',
+    ApiUri: 'https://api.dev2.saooti.org/',
     podcastmaker: false,
     buttonPlus: true,
     allCategories: [],
@@ -24,12 +24,11 @@ const state:paramStore = {
     SharePlayer: true,
     ShareButtons: true,
     ShareDistribution: true,
-    MiniplayerUri: 'https://player.staging.saooti.org/',
-    MiniplayerBetaUri: 'https://playerbeta.staging.saooti.org/',
+    MiniplayerUri: 'https://player.dev2.saooti.org/',
+    MiniplayerBetaUri: 'https://playerbeta.dev2.saooti.org/',
     ouestFranceStyle: false,
-    tagList: false,
     downloadButton: false,
-    hlsUri: 'https://hls.staging.saooti.org/',
+    hlsUri: 'https://hls.dev2.saooti.org/',
     mainRubrique: 0,
     resourceUrl: undefined
   },
@@ -82,10 +81,10 @@ const state:paramStore = {
     userName: '',
   },
   octopusApi: {
-    url: 'http://api.staging.saooti.org/',
-    commentsUrl: 'http://comments.staging.saooti.org/',
-    studioUrl: 'http://studio.staging.saooti.org/',
-    playerUrl: 'https://playerbeta.staging.saooti.org/',
+    url: 'http://api.dev2.saooti.org/',
+    commentsUrl: 'http://comments.dev2.saooti.org/',
+    studioUrl: 'http://studio.dev2.saooti.org/',
+    playerUrl: 'https://playerbeta.dev2.saooti.org/',
     organisationId: undefined,
   },
 };
@@ -114,7 +113,6 @@ export interface PodcastPage{
   MiniplayerUri?: string,
   MiniplayerBetaUri?: string,
   ouestFranceStyle?: boolean,
-  tagList?: boolean,
   downloadButton?: boolean,
   hlsUri?: string,
   mainRubrique?: number,