From c9a02df8a7b5d3a427b6f12ed81bd3556e238b91 Mon Sep 17 00:00:00 2001
From: SubTeno <elppa221@protonmail.com>
Date: Sun, 16 Oct 2022 06:49:08 +0000
Subject: [PATCH] Update 16/10/2022

- Replaced width to min-width in App.vue to fix handleScroll() function
- Reduced videoStep number to 30 as 100 seems unnecessary and thus loads eager content and also reduces server load, (by not loading eager image), but idk the exact number so -- yea.
- Removed custom instance modal to reduce redundancy and to activate reactivity (so that people doesn't need to reload everytime they add/remove a custom instance)
---
 src/App.vue                            |   2 +-
 src/components/CustomInstanceModal.vue | 107 -------------------------
 src/components/FeedPage.vue            |   2 +-
 src/components/PreferencesPage.vue     |  94 +++++++++++++++++++++-
 4 files changed, 93 insertions(+), 112 deletions(-)
 delete mode 100644 src/components/CustomInstanceModal.vue

diff --git a/src/App.vue b/src/App.vue
index 9645eab6..5a865fd7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="flex flex-col h-[calc(100vh_-_32rem)] justify-between">
+    <div class="flex flex-col min-h-[calc(100vh_-_32rem)] justify-between">
         <div>
             <NavBar />
             <div class="pp-base reset">
diff --git a/src/components/CustomInstanceModal.vue b/src/components/CustomInstanceModal.vue
deleted file mode 100644
index 056c6bc0..00000000
--- a/src/components/CustomInstanceModal.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-    <ModalComponent>
-        <h3 v-t="'Custom Instance'" class="font-bold my-4" />
-        <hr />
-        <div class="text-center">
-            <div v-if="customInstances.length" class="remove">
-                <select v-model="selectedInstance">
-                    <option
-                        v-for="(instance, index) in customInstances"
-                        :key="index"
-                        :value="index"
-                        v-text="instance.name"
-                    />
-                </select>
-                <div class="flex justify-end">
-                    <button @click="remove" v-t="'Remove'" />
-                </div>
-            </div>
-            <form class="children:pb-3">
-                <div>
-                    <input
-                        v-model="name"
-                        class="input w-full"
-                        type="text"
-                        :placeholder="'Name'"
-                        :aria-label="'Name'"
-                        v-on:keyup.enter="add($event)"
-                    />
-                </div>
-                <div>
-                    <input
-                        v-model="url"
-                        class="input w-full"
-                        type="text"
-                        :placeholder="'Instance Api URL'"
-                        :aria-label="'Instance Api URL'"
-                        v-on:keyup.enter="add($event)"
-                    />
-                </div>
-                <div class="flex justify-end">
-                    <button @click="add($event)" v-t="'Add'" />
-                </div>
-            </form>
-        </div>
-    </ModalComponent>
-</template>
-
-<script>
-import ModalComponent from "./ModalComponent.vue";
-const isUrl = string => {
-    try {
-        return Boolean(new URL(string));
-    } catch (e) {
-        return false;
-    }
-};
-export default {
-    data() {
-        return {
-            customInstances: [],
-        };
-    },
-    mounted() {
-        if (this.testLocalStorage) {
-            if (localStorage.getItem("custominstances") === null) {
-                localStorage.setItem("custominstances", "[]");
-            }
-            this.customInstances = JSON.parse(localStorage.getItem("custominstances"));
-        }
-    },
-    methods: {
-        add(event) {
-            event.preventDefault();
-            if (this.testLocalStorage) {
-                if (!isUrl(this.url)) {
-                    alert("Not a valid URL");
-                    return;
-                }
-                fetch(this.url + "/healthcheck")
-                    .then(res => {
-                        if (!res.ok) {
-                            alert("Error Backend URL");
-                            return;
-                        }
-                        this.customInstances.push({
-                            name: this.name,
-                            api_url: this.url,
-                        });
-                        localStorage.setItem("custominstances", JSON.stringify(this.customInstances));
-                    })
-                    .catch(() => {
-                        alert("Cannot find URL");
-                        return;
-                    });
-            }
-        },
-        remove() {
-            if (this.testLocalStorage) {
-                this.customInstances.splice(this.selectedInstance, 1);
-                localStorage.setItem("custominstances", JSON.stringify(this.customInstances));
-                location.reload();
-            }
-        },
-    },
-    components: { ModalComponent },
-};
-</script>
diff --git a/src/components/FeedPage.vue b/src/components/FeedPage.vue
index 5d797be0..5010ca47 100644
--- a/src/components/FeedPage.vue
+++ b/src/components/FeedPage.vue
@@ -32,7 +32,7 @@ export default {
     data() {
         return {
             currentVideoCount: 0,
-            videoStep: 100,
+            videoStep: 30,
             videosStore: [],
             videos: [],
         };
diff --git a/src/components/PreferencesPage.vue b/src/components/PreferencesPage.vue
index 7835f960..5d2f66a9 100644
--- a/src/components/PreferencesPage.vue
+++ b/src/components/PreferencesPage.vue
@@ -386,12 +386,55 @@
             </tr>
         </tbody>
     </table>
-    <CustomInstanceModal v-if="showmodal" @close="showmodal = !showmodal" />
+    <ModalComponent v-if="showmodal" @close="showmodal = !showmodal">
+        <h3 v-t="'Custom Instance'" class="font-bold my-4" />
+        <hr />
+        <div class="text-center">
+            <div v-if="customInstances.length" class="remove">
+                <select v-model="selectedInstance">
+                    <option
+                        v-for="(instance, index) in customInstances"
+                        :key="index"
+                        :value="index"
+                        v-text="instance.name"
+                    />
+                </select>
+                <div class="flex justify-end">
+                    <button @click="removeInstance" v-t="'Remove'" />
+                </div>
+            </div>
+            <form class="children:pb-3">
+                <div>
+                    <input
+                        v-model="name"
+                        class="input w-full"
+                        type="text"
+                        :placeholder="'Name'"
+                        :aria-label="'Name'"
+                        v-on:keyup.enter="addInstance($event)"
+                    />
+                </div>
+                <div>
+                    <input
+                        v-model="url"
+                        class="input w-full"
+                        type="text"
+                        :placeholder="'Instance Api URL'"
+                        :aria-label="'Instance Api URL'"
+                        v-on:keyup.enter="addInstance($event)"
+                    />
+                </div>
+                <div class="flex justify-end">
+                    <button @click="addInstance($event)" v-t="'Add'" />
+                </div>
+            </form>
+        </div>
+    </ModalComponent>
 </template>
 
 <script>
 import CountryMap from "@/utils/CountryMaps/en.json";
-import CustomInstanceModal from "./CustomInstanceModal.vue";
+import ModalComponent from "./ModalComponent.vue";
 export default {
     data() {
         return {
@@ -509,6 +552,10 @@ export default {
             this.authInstance = this.getPreferenceBoolean("authInstance", false);
             this.selectedAuthInstance = this.getPreferenceString("auth_instance_url", this.selectedInstance);
             this.sponsorBlock = this.getPreferenceBoolean("sponsorblock", true);
+            if (localStorage.getItem("custominstances") === null) {
+                localStorage.setItem("custominstances", "[]");
+            }
+            this.customInstances = JSON.parse(localStorage.getItem("custominstances"));
             if (localStorage.getItem("selectedSkip") !== null) {
                 var skipList = localStorage.getItem("selectedSkip").split(",");
                 this.skipSponsor =
@@ -585,7 +632,49 @@ export default {
             }
         }
     },
+    components: { ModalComponent },
     methods: {
+        removeInstance() {
+            if (this.testLocalStorage) {
+                this.customInstances.splice(this.selectedInstance, 1);
+                localStorage.setItem("custominstances", JSON.stringify(this.customInstances));
+                location.reload();
+            }
+        },
+        isUrl(string) {
+            try {
+                return Boolean(new URL(string));
+            } catch (e) {
+                return false;
+            }
+        },
+        addInstance(event) {
+            event.preventDefault();
+            if (this.testLocalStorage) {
+                if (!this.isUrl(this.url)) {
+                    alert("Not a valid URL");
+                    return;
+                }
+                const newInstance = {
+                    name: this.name,
+                    api_url: this.url,
+                };
+                fetch(this.url + "/healthcheck")
+                    .then(res => {
+                        if (!res.ok) {
+                            alert("Error Backend URL");
+                            return;
+                        }
+                        this.customInstances.push(newInstance);
+                        this.instances.push(newInstance);
+                        localStorage.setItem("custominstances", JSON.stringify(this.customInstances));
+                    })
+                    .catch(() => {
+                        alert("Cannot find URL");
+                        return;
+                    });
+            }
+        },
         async onChange() {
             if (this.testLocalStorage) {
                 var shouldReload = false;
@@ -691,7 +780,6 @@ export default {
             });
         },
     },
-    components: { CustomInstanceModal },
 };
 </script>