fix: migrate to file upload structure with .url

Kukoon · Mar 12, 2023 · 1a94d71 · 1a94d71
1 parent 8a45461
commit 1a94d71
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 13 deletions.
diff --git a/src/components/AdminDrawer.vue b/src/components/AdminDrawer.vue
@@ -15,7 +15,7 @@
           }"
         >
           <v-list-item-avatar color="black">
-            <v-img v-if="channel.logo" :src="channel.logo" contain />
+            <v-img v-if="channel.logo" :src="channel.logo.url" contain />
             <span v-else>{{ channel.title.slice(0, 2) }}</span>
           </v-list-item-avatar></router-link
         >
@@ -75,7 +75,7 @@
             :to="{ name: 'AdminChannel', params: { channelid: channel.id } }"
           >
             <v-list-item-avatar color="black" size="24" class="mr-8">
-              <v-img v-if="channel.logo" :src="channel.logo" contain />
+              <v-img v-if="channel.logo" :src="channel.logo.url" contain />
               <span v-else>{{ channel.title.slice(0, 2) }}</span>
             </v-list-item-avatar>
             <v-list-item-content>

diff --git a/src/components/Poster.vue b/src/components/Poster.vue
@@ -19,7 +19,7 @@
       <v-img
         v-if="showPreview"
         v-ripple="{ class: 'neutral--text', center: true }"
-        :src="video.preview"
+        :src="video.preview.url"
         class="white--text align-end"
         gradient="to bottom, rgba(0,0,0,0), rgba(0,0,0,.5)"
         height="100%"
@@ -47,7 +47,7 @@
         <v-img
           v-if="!showPreview"
           v-ripple="{ class: 'neutral--text', center: true }"
-          :src="video.poster"
+          :src="video.poster.url"
           class="white--text align-end"
           gradient="to bottom, rgba(0,0,0,0), rgba(0,0,0,.5)"
           height="100%"
@@ -72,7 +72,7 @@
     <v-img
       v-else
       v-ripple="{ class: 'neutral--text', center: true }"
-      :src="video.poster"
+      :src="video.poster.url"
       class="white--text align-end"
       gradient="to bottom, rgba(0,0,0,0), rgba(0,0,0,.5)"
       height="100%"

diff --git a/src/components/VideoPlayer.vue b/src/components/VideoPlayer.vue
@@ -18,7 +18,7 @@ export default {
       // Disabled as source is now passed as a prop from parent component
       // source: this.source,
       options: {
-        image: this.poster,
+        image: this.poster.url,
         autoStart: this.autostart,
         sources: this.sources,
         hlsConfig: {

diff --git a/src/views/Admin/ChannelEvents.vue b/src/views/Admin/ChannelEvents.vue
@@ -48,7 +48,7 @@
               <tr v-for="item in list" :key="item.id">
                 <td>
                   <v-avatar v-if="item.logo" size="32px">
-                    <img :src="item.logo" />
+                    <img :src="item.logo.url" />
                   </v-avatar>
                 </td>
                 <td>{{ item.name }}</td>

diff --git a/src/views/Admin/ChannelLive.vue b/src/views/Admin/ChannelLive.vue
@@ -171,7 +171,7 @@ export default {
       api.Channels.GetStream(this.channelid).then(
         (resp) => {
           this.video = resp.data;
-          if (this.video.poster == "") {
+          if (this.video.poster) {
             this.video.poster = resp.data.channel.logo;
           }
         },

diff --git a/src/views/Admin/ChannelProfile.vue b/src/views/Admin/ChannelProfile.vue
@@ -38,7 +38,7 @@
             style="width: 200px"
           >
             <v-avatar class="ma-4" rounded="0" height="128" width="128">
-              <v-img v-if="channel.logo" :src="channel.logo" contain />
+              <v-img v-if="channel.logo" :src="channel.logo.url" contain />
             </v-avatar>
             <v-btn fab depressed @click="showUploadDialog = true" class="mt-2">
               <v-icon> mdi-pencil </v-icon>
@@ -63,7 +63,8 @@
                 @input="enableSave = true"
               />
               <v-text-field
-                v-model.lazy="channel.logo"
+                v-if="channel.logo"
+                v-model.lazy="channel.logo.url"
                 :color="darkMode ? 'grey lighten-3' : 'grey darken-2'"
                 label="Logo URL"
                 outlined

diff --git a/src/views/Admin/ChannelRecordings.vue b/src/views/Admin/ChannelRecordings.vue
@@ -69,7 +69,7 @@
           >
             <template #item.poster="{ item }">
               <v-img
-                :src="item.poster"
+                :src="item.poster.url"
                 alt="Poster"
                 height="56"
                 max-width="100"

diff --git a/src/views/Main/Live.vue b/src/views/Main/Live.vue
@@ -90,7 +90,7 @@ export default {
       api.Channels.GetStream(this.id).then(
         (resp) => {
           this.video = resp.data;
-          if (this.video.poster == "") {
+          if (this.video.poster) {
             this.video.poster = resp.data.channel.logo;
           }
         },

diff --git a/src/views/Single.vue b/src/views/Single.vue
@@ -64,7 +64,7 @@ export default {
       return api.Channels.GetStream(this.id).then(
         (resp) => {
           this.video = resp.data;
-          if (this.video.poster == "") {
+          if (this.video.poster) {
             this.video.poster = resp.data.channel.logo;
           }
         },