From 8e545dfb27c2cb38a344b594dddd696dd2019eba Mon Sep 17 00:00:00 2001
From: FireMasterK <20838718+FireMasterK@users.noreply.github.com>
Date: Fri, 27 Nov 2020 12:16:36 +0530
Subject: [PATCH] Use Mixins for global functions.

---
 src/components/Channel.vue      | 205 ++++++++++++++++----------------
 src/components/TrendingPage.vue |   3 -
 src/components/WatchVideo.vue   |  10 +-
 src/main.js                     |  26 ++++
 src/utils/TimeUtils.js          |  20 ----
 5 files changed, 134 insertions(+), 130 deletions(-)
 delete mode 100644 src/utils/TimeUtils.js

diff --git a/src/components/Channel.vue b/src/components/Channel.vue
index 790053f7..1c5639b9 100644
--- a/src/components/Channel.vue
+++ b/src/components/Channel.vue
@@ -1,104 +1,101 @@
-<template>
-    <div v-if="channel">
-        <h1 class="uk-text-center">
-            <img v-bind:src="channel.avatarUrl" />{{ channel.name }}
-        </h1>
-        <img
-            v-if="channel.bannerUrl"
-            v-bind:src="channel.bannerUrl"
-            style="width: 100%"
-        />
-        <p v-html="this.channel.description.replaceAll('\n', '<br>')"></p>
-
-        <hr />
-
-        <div class="uk-grid-xl" uk-grid="parallax: 0">
-            <div
-                class="uk-width-1-2 uk-width-1-3@m uk-width-1-4@l uk-width-1-5@xl"
-                v-bind:key="item.url"
-                v-for="item in this.channel.relatedStreams"
-            >
-                <router-link
-                    class="uk-link-muted uk-text-justify"
-                    v-bind:to="item.url || '/'"
-                >
-                    <img style="width: 100%" v-bind:src="item.thumbnail" />
-                    <a>{{ item.title }}</a>
-                </router-link>
-                <br />
-                <div>
-                    <b class="uk-text-small uk-align-left">
-                        {{ timeFormat(item.duration) }}
-                    </b>
-                    <b class="uk-text-small uk-align-right">
-                        <font-awesome-icon icon="eye"></font-awesome-icon>
-                        {{ item.views }} views
-                    </b>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-import Constants from "@/Constants.js";
-
-export default {
-    data() {
-        return {
-            channel: null
-        };
-    },
-    mounted() {
-        this.getChannelData();
-        window.addEventListener("scroll", this.handleScroll);
-    },
-    unmounted() {
-        window.removeEventListener("scroll", this.handleScroll);
-    },
-    methods: {
-        async fetchChannel() {
-            return await (
-                await fetch(
-                    Constants.BASE_URL +
-                        "/channels/" +
-                        this.$route.params.channelId
-                )
-            ).json();
-        },
-        async getChannelData() {
-            this.fetchChannel()
-                .then(data => (this.channel = data))
-                .then(() => (document.title = this.channel.name + " - Piped"));
-        },
-        timeFormat(d) {
-            return require("@/utils/TimeUtils.js").default.timeFormat(d);
-        },
-        handleScroll() {
-            if (this.loading || !this.channel || !this.channel.nextpage) return;
-            if (
-                window.innerHeight + window.scrollY >=
-                document.body.offsetHeight - window.innerHeight / 2
-            ) {
-                this.loading = true;
-                fetch(
-                    Constants.BASE_URL +
-                        "/nextpage/channels/" +
-                        this.$route.params.channelId +
-                        "?url=" +
-                        encodeURIComponent(this.channel.nextpage)
-                )
-                    .then(body => body.json())
-                    .then(json => {
-                        this.channel.relatedStreams.concat(json.relatedStreams);
-                        this.channel.nextpage = json.nextpage;
-                        this.loading = false;
-                        json.relatedStreams.map(stream =>
-                            this.channel.relatedStreams.push(stream)
-                        );
-                    });
-            }
-        }
-    }
-};
-</script>
+<template>
+    <div v-if="channel">
+        <h1 class="uk-text-center">
+            <img v-bind:src="channel.avatarUrl" />{{ channel.name }}
+        </h1>
+        <img
+            v-if="channel.bannerUrl"
+            v-bind:src="channel.bannerUrl"
+            style="width: 100%"
+        />
+        <p v-html="this.channel.description.replaceAll('\n', '<br>')"></p>
+
+        <hr />
+
+        <div class="uk-grid-xl" uk-grid="parallax: 0">
+            <div
+                class="uk-width-1-2 uk-width-1-3@m uk-width-1-4@l uk-width-1-5@xl"
+                v-bind:key="item.url"
+                v-for="item in this.channel.relatedStreams"
+            >
+                <router-link
+                    class="uk-link-muted uk-text-justify"
+                    v-bind:to="item.url || '/'"
+                >
+                    <img style="width: 100%" v-bind:src="item.thumbnail" />
+                    <a>{{ item.title }}</a>
+                </router-link>
+                <br />
+                <div>
+                    <b class="uk-text-small uk-align-left">
+                        {{ timeFormat(item.duration) }}
+                    </b>
+                    <b class="uk-text-small uk-align-right">
+                        <font-awesome-icon icon="eye"></font-awesome-icon>
+                        {{ item.views }} views
+                    </b>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import Constants from "@/Constants.js";
+
+export default {
+    data() {
+        return {
+            channel: null
+        };
+    },
+    mounted() {
+        this.getChannelData();
+        window.addEventListener("scroll", this.handleScroll);
+    },
+    unmounted() {
+        window.removeEventListener("scroll", this.handleScroll);
+    },
+    methods: {
+        async fetchChannel() {
+            return await (
+                await fetch(
+                    Constants.BASE_URL +
+                        "/channels/" +
+                        this.$route.params.channelId
+                )
+            ).json();
+        },
+        async getChannelData() {
+            this.fetchChannel()
+                .then(data => (this.channel = data))
+                .then(() => (document.title = this.channel.name + " - Piped"));
+        },
+        handleScroll() {
+            if (this.loading || !this.channel || !this.channel.nextpage) return;
+            if (
+                window.innerHeight + window.scrollY >=
+                document.body.offsetHeight - window.innerHeight
+            ) {
+                this.loading = true;
+                fetch(
+                    Constants.BASE_URL +
+                        "/nextpage/channels/" +
+                        this.$route.params.channelId +
+                        "?url=" +
+                        encodeURIComponent(this.channel.nextpage)
+                )
+                    .then(body => body.json())
+                    .then(json => {
+                        this.channel.relatedStreams.concat(json.relatedStreams);
+                        this.channel.nextpage = json.nextpage;
+                        this.loading = false;
+                        json.relatedStreams.map(stream =>
+                            this.channel.relatedStreams.push(stream)
+                        );
+                    });
+            }
+        }
+    }
+};
+</script>
diff --git a/src/components/TrendingPage.vue b/src/components/TrendingPage.vue
index a838f2bf..3cf223a2 100644
--- a/src/components/TrendingPage.vue
+++ b/src/components/TrendingPage.vue
@@ -51,9 +51,6 @@ export default {
     methods: {
         async fetchTrending() {
             return await (await fetch(Constants.BASE_URL + "/trending")).json();
-        },
-        timeFormat(d) {
-            return require("@/utils/TimeUtils.js").default.timeFormat(d);
         }
     }
 };
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index e26ae1b0..bb5fa793 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -14,13 +14,17 @@
 
         <p class="uk-dark">
             <font-awesome-icon icon="thumbs-down"></font-awesome-icon>
-            {{ video.likes }}
+            <b>{{ video.likes }}</b>
+            &nbsp;
             <font-awesome-icon icon="thumbs-up"></font-awesome-icon>
-            {{ video.dislikes }}
+            <b>{{ video.dislikes }}</b>
         </p>
         <p>
             <font-awesome-icon icon="eye"></font-awesome-icon>
-            {{ video.views }} views
+            <b>{{ video.views }}</b> views
+        </p>
+        <p>
+            Uploaded on <b>{{ video.uploadDate }}</b>
         </p>
         <p class="uk-light" v-html="video.description"></p>
         <a v-if="sponsors && sponsors.segments"
diff --git a/src/main.js b/src/main.js
index 50d894f9..365196d0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,7 +12,33 @@ import App from './App.vue'
 
 import './registerServiceWorker'
 
+const mixin = {
+    methods: {
+        timeFormat: function (duration) {
+
+            var pad = function (num, size) {
+                return ("000" + num).slice(size * -1);
+            };
+
+            var time = parseFloat(duration).toFixed(3),
+                hours = Math.floor(time / 60 / 60),
+                minutes = Math.floor(time / 60) % 60,
+                seconds = Math.floor(time - minutes * 60);
+
+            var str = "";
+
+            if (hours > 0) str += pad(hours, 2) + ":";
+
+            str += pad(minutes, 2) + ":" + pad(seconds, 2);
+
+            return str;
+
+        }
+    }
+}
+
 const app = createApp(App)
 app.use(router)
+app.mixin(mixin)
 app.component('font-awesome-icon', FontAwesomeIcon)
 app.mount('#app')
diff --git a/src/utils/TimeUtils.js b/src/utils/TimeUtils.js
deleted file mode 100644
index f60fe07f..00000000
--- a/src/utils/TimeUtils.js
+++ /dev/null
@@ -1,20 +0,0 @@
-export default {
-    timeFormat: function (duration) {
-        var pad = function (num, size) {
-            return ("000" + num).slice(size * -1);
-        };
-
-        var time = parseFloat(duration).toFixed(3),
-            hours = Math.floor(time / 60 / 60),
-            minutes = Math.floor(time / 60) % 60,
-            seconds = Math.floor(time - minutes * 60);
-
-        var str = "";
-
-        if (hours > 0) str += pad(hours, 2) + ":";
-
-        str += pad(minutes, 2) + ":" + pad(seconds, 2);
-
-        return str;
-    }
-}