From f1ffb82ed01e18fa46037d647071701eecf43d4e Mon Sep 17 00:00:00 2001
From: Alex <alex.tyshang@gmail.com>
Date: Mon, 21 Mar 2022 13:30:59 +1300
Subject: [PATCH] merge conflicts for watch.vue

---
 NUXT/pages/watch.vue | 113 ++++++++++++++++---------------------------
 1 file changed, 43 insertions(+), 70 deletions(-)

diff --git a/NUXT/pages/watch.vue b/NUXT/pages/watch.vue
index b65ab5e..637a996 100644
--- a/NUXT/pages/watch.vue
+++ b/NUXT/pages/watch.vue
@@ -2,16 +2,23 @@
   <div>
     <video controls autoplay :src="vidSrc" width="100%" height="300vh" />
     <v-card class="ml-2 mr-2 flat light" flat>
-<<<<<<< HEAD
-      <v-card-title style="padding-top: 0">{{ title }}</v-card-title>
+      <v-card-title
+        style="padding-top: 0; padding-bottom: 0; font-size: 0.95em"
+        v-text="title"
+      />
       <v-card-text>
-        <span>{{ views }} views • {{ uploaded }}</span
-        ><br />
+        <div style="margin-bottom: 1em">{{ views }} views • {{ uploaded }}</div>
 
         <!--   Scrolling Div For Interactions   --->
-        <div style="display: flex">
-          <v-list-item v-for="(item, index) in interactions" :key="index">
-            <button
+        <div style="display: flex; margin-bottom: 1em">
+          <v-list-item
+            v-for="(item, index) in interactions"
+            :key="index"
+            style="padding: 0; flex: 0 0 20%"
+          >
+            <v-btn
+              text
+              @click="item.action"
               class="vertical-button"
               style="padding: 0; margin: 0"
               elevation="0"
@@ -19,46 +26,23 @@
             >
               <v-icon v-text="item.icon" />
               <div v-text="item.value || item.name" />
-            </button>
-=======
-      <v-card-title style="padding-top: 0; padding-bottom: 0; font-size: 0.95em;" v-text="title" />
-      <v-card-text>
-        <div style="margin-bottom: 1em;">{{ views }} views • {{uploaded}}</div>
-        
-        <!--   Scrolling Div For Interactions   --->
-        <div style="display: flex; margin-bottom: 1em;">
-          <v-list-item v-for="(item, index) in interactions" :key="index" style="padding: 0; flex: 0 0 20%;">
-
-            
-            <v-btn text @click="item.action" class="vertical-button" style="padding: 0; margin: 0;" elevation=0 :disabled="item.disabled">
-              <v-icon v-text="item.icon" />
-              <div v-text="item.value || item.name" />
             </v-btn>
-
->>>>>>> 884670f709fd1e7cb9ea66a5819afb4adfae1c0d
           </v-list-item>
 
-
           <v-spacer />
           <v-btn text @click="showMore = !showMore">
             <v-icon v-if="showMore">mdi-chevron-up</v-icon>
             <v-icon v-else>mdi-chevron-down</v-icon>
           </v-btn>
-
         </div>
         <!--   End Scrolling Div For Interactions   --->
-<<<<<<< HEAD
-=======
-        <hr>
+        <hr />
         <p>Channel Stuff</p>
-        <hr>
-
-
->>>>>>> 884670f709fd1e7cb9ea66a5819afb4adfae1c0d
+        <hr />
       </v-card-text>
-          <div class="scroll-y ml-2 mr-2" v-if="showMore">
-            {{ description }}
-          </div>
+      <div class="scroll-y ml-2 mr-2" v-if="showMore">
+        {{ description }}
+      </div>
 
       <!--<v-bottom-sheet v-model="showMore" color="accent2" style="z-index: 9999999;">
         <v-sheet style="padding: 1em;">
@@ -71,14 +55,11 @@
         
         </v-sheet>
       </v-bottom-sheet>-->
-      <v-bottom-sheet v-model="share" color="accent2" style="z-index: 9999999;">
-        <v-sheet style="padding: 1em;">
-        
-
+      <v-bottom-sheet v-model="share" color="accent2" style="z-index: 9999999">
+        <v-sheet style="padding: 1em">
           <div class="scroll-y">
             {{ description }}
           </div>
-        
         </v-sheet>
       </v-bottom-sheet>
     </v-card>
@@ -100,18 +81,34 @@
 export default {
   components: { recommended },
   methods: {
-    dislike() {
-    },
+    dislike() {},
     share() {
       this.share = !this.share;
-    }
+    },
   },
   data() {
     return {
       interactions: [
-        { name: "Likes", icon: "mdi-thumb-up", action: null, value: this.likes, disabled: true },
-        { name: "Dislikes", icon: "mdi-thumb-down", action: this.dislike(), value: this.dislikes, disabled: true  },
-        { name: "Share", icon: "mdi-share", action: this.share(), disabled: true },
+        {
+          name: "Likes",
+          icon: "mdi-thumb-up",
+          action: null,
+          value: this.likes,
+          disabled: true,
+        },
+        {
+          name: "Dislikes",
+          icon: "mdi-thumb-down",
+          action: this.dislike(),
+          value: this.dislikes,
+          disabled: true,
+        },
+        {
+          name: "Share",
+          icon: "mdi-share",
+          action: this.share(),
+          disabled: true,
+        },
       ],
       showMore: false,
       share: false,
@@ -124,7 +121,6 @@ export default {
     };
   },
   mounted() {
-<<<<<<< HEAD
     this.likes = 100;
 
     this.$youtube.getVid(this.$route.query.v).then((result) => {
@@ -150,29 +146,6 @@ export default {
     this.$youtube.getReturnYoutubeDislike(this.$route.query.v, (data) => {
       this.dislikes = data.dislikes.toLocaleString();
       this.interactions[1].value = data.dislikes.toLocaleString();
-=======
-
-    this.$youtube.getVid(this.$route.query.v).then(result => {
-      console.log('Video info data', result)
-      result = result.data;
-      console.log(result.streamingData.formats)
-      this.vidSrc = result.streamingData.formats[result.streamingData.formats.length-1].url
-      this.title = result.videoDetails.title
-      this.description = result.videoDetails.shortDescription;
-      this.views = result.videoDetails.viewCount.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-    });
-
-    
-    this.$youtube.getRemainingVideoInfo(this.$route.query.v, (data) => {
-      this.uploaded = data.uploadDate;
-      this.interactions[0].value = data.likes.toString();
-    });
-    
-    this.$ryd.getDislikes(this.$route.query.v, (data) => {
-      console.log('real data')
-      console.log(data)
-      this.interactions[1].value = data.dislikes.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
->>>>>>> 884670f709fd1e7cb9ea66a5819afb4adfae1c0d
     });
   },
 };