From d27ef3560c742274e119872b5445b277f180cbb5 Mon Sep 17 00:00:00 2001
From: dragongoose <dragonmail14@protonmail.com>
Date: Mon, 10 Apr 2023 00:12:52 -0400
Subject: [PATCH] Add proper error handling and loading screen

---
 src/components/ErrorMessage.vue  | 24 +---------
 src/components/LoadingScreen.vue |  8 ++++
 src/views/CategoryView.vue       | 34 +++++++++----
 src/views/HomepageView.vue       | 38 +++++++++++----
 src/views/UserView.vue           | 82 ++++++++++++++------------------
 5 files changed, 100 insertions(+), 86 deletions(-)
 create mode 100644 src/components/LoadingScreen.vue

diff --git a/src/components/ErrorMessage.vue b/src/components/ErrorMessage.vue
index c68167e..2d7a0c7 100644
--- a/src/components/ErrorMessage.vue
+++ b/src/components/ErrorMessage.vue
@@ -1,22 +1,5 @@
 <script lang="ts">
-export default {
-  props: {
-    errMessage: {
-      type: Object,
-      default() {
-        {
-          ;('Error')
-        }
-      }
-    }
-  },
-
-  setup(props) {
-    return {
-      errorMessage: props.errMessage
-    }
-  }
-}
+export default {}
 </script>
 
 <template>
@@ -31,10 +14,5 @@ export default {
     <p class="text-xl">
       the server was encountered an error while retriving the data, and now we're here :3
     </p>
-
-    <div class="mt-5">
-      <p class="text-xl">please contact the administrator with this code</p>
-      <p class="text-xl">error identifier: {{ errorMessage.code }}</p>
-    </div>
   </div>
 </template>
diff --git a/src/components/LoadingScreen.vue b/src/components/LoadingScreen.vue
new file mode 100644
index 0000000..b84bead
--- /dev/null
+++ b/src/components/LoadingScreen.vue
@@ -0,0 +1,8 @@
+<template>
+    <div class="flex mx-auto justify-center bg-ctp-crust rounded-lg w-2/3 p-2 text-white">
+        <div class="flex space-x-3">
+            <h1 class="text-4xl font-bold">Searching...</h1>
+            <v-icon name="fa-circle-notch" class="animate-spin w-10 h-10"></v-icon>
+        </div>
+    </div>
+</template>
\ No newline at end of file
diff --git a/src/views/CategoryView.vue b/src/views/CategoryView.vue
index 8a80d35..efe8afa 100644
--- a/src/views/CategoryView.vue
+++ b/src/views/CategoryView.vue
@@ -1,22 +1,35 @@
 <script lang="ts">
-import { useRoute } from 'vue-router'
+import { ref, type Ref } from 'vue'
 import StreamPreviewVue from '@/components/StreamPreview.vue'
+import ErrorMessage from '@/components/ErrorMessage.vue'
+import LoadingScreen from '@/components/LoadingScreen.vue'
 
 export default {
   async setup() {
     const protocol = import.meta.env.VITE_HTTPS === 'true' ? 'https://' : 'http://'
+    const data: Ref<any | undefined> = ref()
+    const frontend_url = protocol + import.meta.env.VITE_INSTANCE_DOMAIN
 
-    const route = useRoute()
-    const game = route.params.game
-    const res = await fetch(`${protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/discover/${game}`)
-    const data = await res.json()
-    let frontend_url = protocol + import.meta.env.VITE_INSTANCE_DOMAIN
     return {
       data,
       frontend_url
     }
   },
+  async mounted() {
+    const protocol = import.meta.env.VITE_HTTPS === 'true' ? 'https://' : 'http://'
+    const game: string = this.$route.params.game.toString()
 
+    try {
+        const res = await fetch(`${protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/discover/${game}`)
+        if (!res.ok) {
+          return this.data = { status: 'error' }
+        }
+        this.data = await res.json()
+      } catch (err) {
+        this.data = { status: 'error' }
+        console.error(err)
+      }
+  },
   methods: {
     abbreviate(text: number) {
       return Intl.NumberFormat('en-US', {
@@ -27,13 +40,18 @@ export default {
     }
   },
   components: {
-    StreamPreviewVue
+    StreamPreviewVue,
+    ErrorMessage,
+    LoadingScreen
   }
 }
 </script>
 
 <template>
-  <div class="flex flex-col max-w-5xl mx-auto">
+  <loading-screen v-if="!data"></loading-screen>
+  <error-message v-else-if="data.status === 'error' || !data"></error-message>
+
+  <div v-else class="flex flex-col max-w-5xl mx-auto">
     <div class="flex space-x-4 p-3">
       <img :src="data.cover" class="self-start rounded-md" />
 
diff --git a/src/views/HomepageView.vue b/src/views/HomepageView.vue
index 97695ef..827c159 100644
--- a/src/views/HomepageView.vue
+++ b/src/views/HomepageView.vue
@@ -1,15 +1,16 @@
 <script lang="ts">
 import { ref, type Ref } from 'vue'
 import StreamPreviewVue from '@/components/StreamPreview.vue'
+import ErrorMessage from '@/components/ErrorMessage.vue'
+import LoadingScreen from '@/components/LoadingScreen.vue'
 
 export default {
   async setup() {
     const protocol = import.meta.env.VITE_HTTPS === 'true' ? 'https://' : 'http://'
     
-    const res = await fetch(`${protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/discover`)
-    let data: Ref<any[] | undefined> = ref()
+    let data: Ref<any | undefined> = ref()
     let frontend_url = protocol + import.meta.env.VITE_INSTANCE_DOMAIN
-    data.value = await res.json()
+  
 
     return {
       data,
@@ -29,8 +30,8 @@ export default {
     },
 
     filterSearches(toFilter: string) {
-      const categories = this.$refs.categoryItem
-      const wantedTags = toFilter.split(',').filter((v) => v.toLowerCase())
+      const categories: HTMLCollectionOf<Element> = this.$refs.categoryItem as HTMLCollectionOf<Element>
+      const wantedTags: string[] = toFilter.split(',').filter((v) => v.toLowerCase())
 
       for (let category of categories as any) {
         let tagElements = category.getElementsByTagName('span')
@@ -67,6 +68,9 @@ export default {
           const res = await fetch(
             `${this.protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/discover/?cursor=${cursor}`
           )
+          if (!res.ok) {
+            throw new Error('Failed to fetch data')
+          }
           const data = await res.json()
 
           for (let category of data) {
@@ -76,7 +80,7 @@ export default {
       }
     }
   },
-  mounted() {
+  async mounted() {
     this.getNextCategory()
 
     let following = localStorage.getItem('following')
@@ -85,15 +89,33 @@ export default {
     } else {
       this.following = []
     }
+
+    try {
+      const res = await fetch(`${this.protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/discover`)
+      if (!res.ok) {
+        throw new Error('Failed to fetch data')
+      }
+      this.data = await res.json()
+    } catch (error) {
+      console.error(error)
+      this.data = { status: 'error' }
+    }
+
   },
   components: {
-    StreamPreviewVue
+    StreamPreviewVue,
+    ErrorMessage,
+    LoadingScreen
   }
 }
 </script>
 
 <template>
-  <div class="max-w-5xl mx-auto">
+
+  <loading-screen v-if="!data"></loading-screen>
+  <error-message v-else-if="data.status === 'error'"></error-message>
+
+  <div v-else class="max-w-5xl mx-auto">
     <div v-if="following.length > 0" class="p-2 text-white">
       <h1 class="font-bold text-5xl">Following</h1>
       <p class="text-xl">Streamers you follow</p>
diff --git a/src/views/UserView.vue b/src/views/UserView.vue
index fb637d7..6a3bc6b 100644
--- a/src/views/UserView.vue
+++ b/src/views/UserView.vue
@@ -5,61 +5,56 @@ import VideoPlayer from '@/components/VideoPlayer.vue'
 import TwitchChat from '@/components/TwitchChat.vue'
 import ErrorMessage from '@/components/ErrorMessage.vue'
 import FollowButton from '@/components/FollowButton.vue'
+import LoadingScreen from '@/components/LoadingScreen.vue'
 
 export default {
   async setup() {
     const route = useRoute()
     const username = route.params.username
     const protocol = import.meta.env.VITE_HTTPS === 'true' ? 'https://' : 'http://'
-
+    
     const getUser = async () => {
-      const res = await fetch(`${protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/users/${username}`)
-
-      if (res.status !== 200) {
+      try {
+        const res = await fetch(`${protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/api/users/${username}`)
         const data = await res.json()
-
-        if (!data.code) {
-          return {
-            status: 'error',
-            code: 'error'
-          }
-        }
-
+        return data
+      } catch (error) {
+        console.error(error)
         return {
-          ...data
+          status: 'error',
         }
       }
-
-      const data = await res.json()
-      return data
     }
 
     const data = ref()
-    onMounted(async () => {
-      const fetchedUser = await getUser()
-      data.value = fetchedUser
-    })
+    const videoOptions = {
+      autoplay: true,
+      controls: true,
+      sources: [
+        {
+          src: `${protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/proxy/stream/${username}/hls.m3u8`,
+          type: 'application/vnd.apple.mpegurl'
+        }
+      ],
+      fluid: true
+    }
 
     return {
       data,
-      videoOptions: {
-        autoplay: true,
-        controls: true,
-        sources: [
-          {
-            src: `${protocol}${import.meta.env.VITE_BACKEND_DOMAIN}/proxy/stream/${username}/hls.m3u8`,
-            type: 'application/vnd.apple.mpegurl'
-          }
-        ],
-        fluid: true
-      }
+      videoOptions,
+      getUser
     }
   },
   components: {
-    VideoPlayer,
-    TwitchChat,
-    ErrorMessage,
-    FollowButton
+        VideoPlayer,
+        TwitchChat,
+        ErrorMessage,
+        FollowButton,
+        LoadingScreen
+  },
+  async mounted() {
+    const fetchedUser = await this.getUser()
+    this.data = fetchedUser
   },
   methods: {
     truncate(value: string, length: number) {
@@ -73,19 +68,12 @@ export default {
 }
 </script>
 
-<template>
-  <div
-    v-if="!data"
-    id="loadingDiv"
-    class="flex mx-auto justify-center bg-ctp-crust rounded-lg w-2/3 p-2 text-white"
-  >
-    <div class="flex space-x-3">
-      <h1 class="text-4xl font-bold">Searching...</h1>
-      <v-icon name="fa-circle-notch" class="animate-spin w-10 h-10"></v-icon>
-    </div>
-  </div>
 
-  <error-message v-else-if="data.status === 'error'" :errMessage="data"></error-message>
+<template>
+
+  <loading-screen v-if="!data"></loading-screen>
+
+  <error-message v-else-if="data.status === 'error'"></error-message>
 
   <div v-else class="w-full justify-center inline-flex space-x-4 p-4">
     <div class="flex bg-ctp-crust flex-col p-6 rounded-lg max-w-prose min-w-[65ch] text-white">