From 432b3b69c2a4b6d59f01b1e444f8a78e290fd272 Mon Sep 17 00:00:00 2001
From: SubTeno <elppa221@protonmail.com>
Date: Tue, 11 Oct 2022 07:28:55 +0000
Subject: [PATCH] Update -Adjusted modal width for laptop and mobile -Added
 custom instance feature

---
 src/components/CustomInstanceModal.vue | 82 ++++++++++++++++++++++++++
 src/components/ModalComponent.vue      | 13 +++-
 src/components/PreferencesPage.vue     | 52 +++++++++-------
 3 files changed, 124 insertions(+), 23 deletions(-)
 create mode 100644 src/components/CustomInstanceModal.vue

diff --git a/src/components/CustomInstanceModal.vue b/src/components/CustomInstanceModal.vue
new file mode 100644
index 00000000..14ebb23a
--- /dev/null
+++ b/src/components/CustomInstanceModal.vue
@@ -0,0 +1,82 @@
+<template>
+    <ModalComponent>
+        <h3 v-t="'Custom Instance'" class="font-bold my-4" />
+        <hr />
+        <div class="text-center">
+            <select v-model="selectedInstance">
+                <option
+                    v-for="(instance, pointer) in custominstance"
+                    :key="pointer"
+                    :value="pointer"
+                    v-text="instance.name"
+                />
+            </select>
+            <div class="flex justify-end">
+                <button @click="remove" v-t="'Remove'" />
+            </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"
+                    />
+                </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"
+                    />
+                </div>
+                <div class="flex justify-end">
+                    <button @click="add" v-t="'Add'" />
+                </div>
+            </form>
+        </div>
+    </ModalComponent>
+</template>
+
+<script>
+import ModalComponent from "./ModalComponent.vue";
+export default {
+    data() {
+        return {
+            custominstance: [],
+        };
+    },
+    mounted() {
+        if (this.testLocalStorage) {
+            if (localStorage.getItem("custominstance") === null) {
+                localStorage.setItem("custominstance", "[]");
+            }
+            this.custominstance = JSON.parse(localStorage.getItem("custominstance"));
+        }
+    },
+    methods: {
+        add() {
+            if (this.testLocalStorage) {
+                this.custominstance.push({
+                    name: this.name,
+                    api_url: this.url,
+                });
+                localStorage.setItem("custominstance", JSON.stringify(this.custominstance));
+            }
+        },
+        remove() {
+            if (this.testLocalStorage) {
+                this.custominstance.splice(this.selectedInstance);
+                localStorage.setItem("custominstance", JSON.stringify(this.custominstance));
+                window.location = "/preferences";
+            }
+        },
+    },
+    components: { ModalComponent },
+};
+</script>
diff --git a/src/components/ModalComponent.vue b/src/components/ModalComponent.vue
index 90f11d4e..78e173e6 100644
--- a/src/components/ModalComponent.vue
+++ b/src/components/ModalComponent.vue
@@ -33,6 +33,9 @@ export default {
 </script>
 
 <style>
+h3 {
+    @apply text-center;
+}
 .modal {
     @apply fixed z-50 top-0 left-0 w-full h-full bg-dark-900 bg-opacity-80 transition-opacity table;
 }
@@ -42,10 +45,16 @@ export default {
 }
 
 .modal-container {
-    @apply w-min m-auto min-w-[20vw] relative;
+    @apply w-fit m-auto min-w-[20vw] relative;
+}
+
+@media (max-width: 1024px) {
+    .modal-container {
+        @apply w-fit m-auto min-w-[40vw] relative;
+    }
 }
 
 .modal-container > button {
-    @apply absolute right-50 top-30;
+    @apply float-right ml-40;
 }
 </style>
diff --git a/src/components/PreferencesPage.vue b/src/components/PreferencesPage.vue
index b817eb60..d878b3cb 100644
--- a/src/components/PreferencesPage.vue
+++ b/src/components/PreferencesPage.vue
@@ -85,14 +85,15 @@
                     </select>
                 </label>
             </template>
+            <button @click="showmodal = !showmodal">Custom Instance</button>
             <br />
 
             <p v-t="'info.preferences_note'" />
-            <button class="btn" v-t="'actions.reset_preferences'" @click="resetPreferences()" />
-            <button class="btn mx-4" v-t="'actions.backup_preferences'" @click="backupPreferences()" />
+            <button v-t="'actions.reset_preferences'" @click="resetPreferences()" />
+            <button v-t="'actions.backup_preferences'" @click="backupPreferences()" />
             <label
                 for="fileSelector"
-                class="btn text-center"
+                class="btn text-center cursor-pointer"
                 v-t="'actions.restore_preferences'"
                 @click="restorePreferences()"
             />
@@ -385,10 +386,12 @@
             </tr>
         </tbody>
     </table>
+    <CustomInstanceModal v-if="showmodal" @close="showmodal = !showmodal" />
 </template>
 
 <script>
 import CountryMap from "@/utils/CountryMaps/en.json";
+import CustomInstanceModal from "./CustomInstanceModal.vue";
 export default {
     data() {
         return {
@@ -396,6 +399,8 @@ export default {
             authInstance: false,
             selectedAuthInstance: null,
             instances: [],
+            custominstances: [],
+            showmodal: false,
             sponsorBlock: true,
             skipSponsor: true,
             skipIntro: false,
@@ -478,23 +483,33 @@ export default {
     },
     async mounted() {
         if (Object.keys(this.$route.query).length > 0) this.$router.replace({ query: {} });
-
-        this.fetchJson("https://piped-instances.kavin.rocks/").then(resp => {
-            this.instances = resp;
-            if (this.instances.filter(instance => instance.api_url == this.apiUrl()).length == 0)
-                this.instances.push({
-                    name: "Custom Instance",
-                    api_url: this.apiUrl(),
-                    locations: "Unknown",
-                    cdn: false,
-                });
-        });
+        this.custominstances = JSON.parse(localStorage.getItem("custominstance"));
+        this.fetchJson("https://piped-instances.kavin.rocks/")
+            .then(resp => {
+                this.instances = resp;
+                if (this.custominstances != null)
+                    this.custominstances.forEach(cusinstance => {
+                        this.instances.push(cusinstance);
+                    });
+                if (this.instances.filter(instance => instance.api_url == this.apiUrl()).length == 0)
+                    this.instances.push({
+                        name: "Custom Instance",
+                        api_url: this.apiUrl(),
+                        locations: "Unknown",
+                        cdn: false,
+                    });
+            })
+            .catch(() => {
+                if (this.custominstances != null)
+                    this.custominstances.forEach(cusinstance => {
+                        this.instances.push(cusinstance);
+                    });
+            });
 
         if (this.testLocalStorage) {
             this.selectedInstance = this.getPreferenceString("instance", "https://pipedapi.kavin.rocks");
             this.authInstance = this.getPreferenceBoolean("authInstance", false);
             this.selectedAuthInstance = this.getPreferenceString("auth_instance_url", this.selectedInstance);
-
             this.sponsorBlock = this.getPreferenceBoolean("sponsorblock", true);
             if (localStorage.getItem("selectedSkip") !== null) {
                 var skipList = localStorage.getItem("selectedSkip").split(",");
@@ -543,7 +558,6 @@ export default {
                     }
                 });
             }
-
             this.showMarkers = this.getPreferenceBoolean("showMarkers", true);
             this.selectedTheme = this.getPreferenceString("theme", "dark");
             this.autoPlayVideo = this.getPreferenceBoolean("playerAutoPlay", true);
@@ -577,7 +591,6 @@ export default {
         async onChange() {
             if (this.testLocalStorage) {
                 var shouldReload = false;
-
                 if (
                     this.getPreferenceString("theme", "dark") !== this.selectedTheme ||
                     this.getPreferenceBoolean("watchHistory", false) != this.watchHistory ||
@@ -585,12 +598,10 @@ export default {
                     this.getPreferenceString("enabledCodecs", "av1,vp9,avc") !== this.enabledCodecs.join(",")
                 )
                     shouldReload = true;
-
                 localStorage.setItem("instance", this.selectedInstance);
                 localStorage.setItem("authInstance", this.authInstance);
                 localStorage.setItem("auth_instance_url", this.selectedAuthInstance);
                 localStorage.setItem("sponsorblock", this.sponsorBlock);
-
                 var sponsorSelected = [];
                 if (this.skipSponsor) sponsorSelected.push("sponsor");
                 if (this.skipIntro) sponsorSelected.push("intro");
@@ -602,7 +613,6 @@ export default {
                 if (this.skipHighlight) sponsorSelected.push("poi_highlight");
                 if (this.skipFiller) sponsorSelected.push("filler");
                 localStorage.setItem("selectedSkip", sponsorSelected);
-
                 localStorage.setItem("showMarkers", this.showMarkers);
                 localStorage.setItem("theme", this.selectedTheme);
                 localStorage.setItem("playerAutoPlay", this.autoPlayVideo);
@@ -622,7 +632,6 @@ export default {
                 localStorage.setItem("disableLBRY", this.disableLBRY);
                 localStorage.setItem("proxyLBRY", this.proxyLBRY);
                 localStorage.setItem("hideWatched", this.hideWatched);
-
                 if (shouldReload) window.location.reload();
             }
         },
@@ -684,6 +693,7 @@ export default {
             });
         },
     },
+    components: { CustomInstanceModal },
 };
 </script>