From e1a71a0c7955e9ac20b67402635e7fb747adc839 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Mon, 10 Apr 2023 00:55:04 +0800
Subject: [PATCH] feat: add skeleton loading animation for anime page

---
 src/contentScripts/views/Anime/Anime.vue      | 176 ++++++------------
 .../views/Anime/components/AnimeCard.vue      |  61 ++++++
 .../Anime/components/AnimeCardSkeleton.vue    |  16 ++
 src/contentScripts/views/Anime/types.ts       |   2 +
 4 files changed, 139 insertions(+), 116 deletions(-)
 create mode 100644 src/contentScripts/views/Anime/components/AnimeCard.vue
 create mode 100644 src/contentScripts/views/Anime/components/AnimeCardSkeleton.vue

diff --git a/src/contentScripts/views/Anime/Anime.vue b/src/contentScripts/views/Anime/Anime.vue
index 52ac77ae..f7f5e132 100644
--- a/src/contentScripts/views/Anime/Anime.vue
+++ b/src/contentScripts/views/Anime/Anime.vue
@@ -1,16 +1,18 @@
 <script setup lang="ts">
 // import PopularAnimeCarousel from './components/PopularAnimeCarousel.vue'
 import AnimeTimeTable from './components/AnimeTimeTable.vue'
+import AnimeCard from './components/AnimeCard.vue'
+import AnimeCardSkeleton from './components/AnimeCardSkeleton.vue'
 import type { AnimeItem, PopularAnime } from './types'
 import { getUserID, numFormatter, removeHttpFromUrl } from '~/utils'
-import { LanguageType } from '~/enums/appEnums'
-import { language } from '~/logic'
 
 const animeWatchList = reactive<AnimeItem[]>([])
 const recommendAnimeList = reactive<AnimeItem[]>([])
 const popularAnimeList = reactive<AnimeItem[]>([])
-const coursor = ref<number>(29) // 遊標默認必須要非0，否則第一次會出現同樣的結果
-const isLoading = ref<boolean>()
+const coursor = ref<number>(0)
+const isLoadingAnimeWatchList = ref<boolean>()
+const isLoadingPopularAnime = ref<boolean>()
+const isLoadingRecommendAnime = ref<boolean>()
 const activatedSeasonId = ref<number>()
 
 onMounted(() => {
@@ -23,7 +25,7 @@ onMounted(() => {
       window.innerHeight + window.scrollY
       >= document.body.scrollHeight - 20
     ) {
-      if (isLoading.value)
+      if (isLoadingRecommendAnime.value)
         return
 
       getRecommendAnimeList()
@@ -37,7 +39,7 @@ onUnmounted(() => {
 })
 
 function getAnimeWatchList() {
-  isLoading.value = true
+  isLoadingAnimeWatchList.value = true
   browser.runtime
     .sendMessage({
       contentScriptQuery: 'getAnimeWatchList',
@@ -55,12 +57,12 @@ function getAnimeWatchList() {
     })
     .catch(() => Object.assign(animeWatchList, []))
     .finally(() => {
-      isLoading.value = false
+      isLoadingAnimeWatchList.value = false
     })
 }
 
 function getRecommendAnimeList() {
-  isLoading.value = true
+  isLoadingRecommendAnime.value = true
   browser.runtime
     .sendMessage({
       contentScriptQuery: 'getRecommendAnimeList',
@@ -78,13 +80,14 @@ function getRecommendAnimeList() {
 
         coursor.value = coursor
       }
-    }).catch(() => coursor.value = 29)
+    }).catch(() => coursor.value = 0)
     .finally(() => {
-      isLoading.value = false
+      isLoadingRecommendAnime.value = false
     })
 }
 
 function getPopularAnimeList() {
+  isLoadingPopularAnime.value = true
   browser.runtime
     .sendMessage({
       contentScriptQuery: 'getPopularAnimeList',
@@ -97,6 +100,8 @@ function getPopularAnimeList() {
       if (code === 0)
         Object.assign(popularAnimeList, list as PopularAnime[])
     })
+    .catch(() => {})
+    .finally(() => isLoadingPopularAnime.value = false)
 }
 </script>
 
@@ -121,60 +126,34 @@ function getPopularAnimeList() {
 
         <HorizontalScrollView w="[calc(100%+1.5rem)]">
           <div w-full flex>
-            <article
+            <template v-if="isLoadingAnimeWatchList">
+              <AnimeCardSkeleton
+                v-for="item in 6" :key="item"
+                w="2xl:[calc(100%/6-1.5rem)] xl:[calc(100%/5-1.5rem)] lg:[calc(100%/4-1.5rem)] md:[calc(100%/3-1.5rem)] sm:[calc(100%/2-1.5rem)] [calc(100%-1.5rem)]"
+                last:w="2xl:1/6 xl:1/5 lg:1/4 md:1/3 sm:1/2 full"
+                shrink-0
+                m="r-6"
+                last:pr-6
+              />
+            </template>
+            <AnimeCard
               v-for="item in animeWatchList"
               :key="item.episode_id"
+              :url="item.url"
+              :cover="item.cover"
+              :title="item.title"
+              :capsule-text="item.is_finish
+                ? $t('anime.total_episodes', { ep: item.total_count })
+                : $t('anime.update_to_n_episodes', {
+                  ep: item.total_count,
+                })"
+              :desc="item.progress !== '' ? item.progress : $t('anime.havent_seen')"
               w="2xl:[calc(100%/6-1.5rem)] xl:[calc(100%/5-1.5rem)] lg:[calc(100%/4-1.5rem)] md:[calc(100%/3-1.5rem)] sm:[calc(100%/2-1.5rem)] [calc(100%-1.5rem)]"
               last:w="2xl:1/6 xl:1/5 lg:1/4 md:1/3 sm:1/2 full"
               shrink-0
               m="r-6"
               last:pr-6
-            >
-              <a
-                rounded="$bew-radius"
-                aspect="12/16"
-                overflow-hidden
-                mb-4
-                bg="$bew-fill-3"
-                :href="item.url"
-                target="_blank"
-              >
-                <img
-                  :src="`${removeHttpFromUrl(item.cover)}@466w_622h.webp`"
-                  :alt="item.title"
-                  rounded="$bew-radius"
-                >
-              </a>
-              <p un-text="lg" my-4>
-                <a
-                  :href="item.url"
-                  target="_blank"
-                  class="keep-two-lines"
-                  :title="item.title"
-                >
-                  {{ item.title }}
-                </a>
-              </p>
-              <p text="$bew-text-2" mb-10>
-                <span
-                  text="$bew-theme-color"
-                  bg="$bew-theme-color-20"
-                  p="x-3 y-1"
-                  mr-2
-                  rounded-4
-                  lh-loose
-                >{{
-                  item.is_finish
-                    ? $t('anime.total_episodes', { ep: item.total_count })
-                    : $t('anime.update_to_n_episodes', {
-                      ep: item.total_count,
-                    })
-                }}</span>
-                {{
-                  item.progress !== '' ? item.progress : $t('anime.havent_seen')
-                }}
-              </p>
-            </article>
+            />
           </div>
         </HorizontalScrollView>
       </section>
@@ -194,7 +173,17 @@ function getPopularAnimeList() {
 
         <HorizontalScrollView w="[calc(100%+1.5rem)]">
           <div w-full flex>
-            <article
+            <template v-if="isLoadingPopularAnime">
+              <AnimeCardSkeleton
+                v-for="item in 6" :key="item"
+                w="2xl:[calc(100%/6-1.5rem)] xl:[calc(100%/5-1.5rem)] lg:[calc(100%/4-1.5rem)] md:[calc(100%/3-1.5rem)] sm:[calc(100%/2-1.5rem)] [calc(100%-1.5rem)]"
+                last:w="2xl:1/6 xl:1/5 lg:1/4 md:1/3 sm:1/2 full"
+                shrink-0
+                m="r-6"
+                last:pr-6
+              />
+            </template>
+            <AnimeCard
               v-for="item in popularAnimeList"
               :key="item.episode_id"
               w="2xl:[calc(100%/6-1.5rem)] xl:[calc(100%/5-1.5rem)] lg:[calc(100%/4-1.5rem)] md:[calc(100%/3-1.5rem)] sm:[calc(100%/2-1.5rem)] [calc(100%-1.5rem)]"
@@ -202,63 +191,13 @@ function getPopularAnimeList() {
               shrink-0
               m="r-6"
               last:pr-6
-            >
-              <a
-                rounded="$bew-radius"
-                aspect="12/16"
-                mb-4
-                bg="$bew-fill-3"
-                :href="item.url"
-                target="_blank"
-                relative
-              >
-                <div
-                  w-full
-                  pos="absolute bottom-0"
-                  text="white 7xl shadow-xl"
-                  px-2
-                  fw-bold
-                  h-150px
-                  flex
-                  items-end
-                  bg="gradient-to-b gradient-from-transparent gradient-to-[rgba(0,0,0,.6)]"
-                  rounded-b="$bew-radius"
-                >
-                  {{ item.rank }}
-                </div>
-                <img
-                  :src="`${removeHttpFromUrl(item.cover)}@466w_622h.webp`"
-                  :alt="item.title"
-                  rounded="$bew-radius"
-                >
-              </a>
-              <p un-text="lg" my-4>
-                <a
-                  :href="item.url"
-                  target="_blank"
-                  class="keep-two-lines"
-                  :title="item.title"
-                >
-                  {{ item.title }}
-                </a>
-              </p>
-              <p text="$bew-text-2" mb-10>
-                <span
-                  text="$bew-theme-color"
-                  bg="$bew-theme-color-20"
-                  p="x-3 y-1"
-                  mr-2
-                  rounded-4
-                  lh-loose
-                >{{ item.rating.replace('分', '') }}
-                </span>
-                {{
-                  $t('anime.follow', {
-                    num: numFormatter(item.stat.series_follow),
-                  })
-                }}
-              </p>
-            </article>
+              :url="item.url"
+              :cover="item.cover"
+              :title="item.title"
+              :desc="$t('anime.follow', { num: numFormatter(item.stat.series_follow) })"
+              :capsule-text="item.rating ? item.rating.replace('分', '') : '-:-'"
+              :rank="item.rank"
+            />
           </div>
         </HorizontalScrollView>
       </section>
@@ -386,11 +325,16 @@ function getPopularAnimeList() {
               {{ item.sub_title }}
             </p>
           </article>
+          <template v-if="isLoadingRecommendAnime">
+            <AnimeCardSkeleton
+              v-for="item in 30" :key="item"
+            />
+          </template>
         </div>
       </section>
     </div>
     <!-- loading -->
-    <loading v-if="isLoading && recommendAnimeList.length !== 0" m="-t-4" />
+    <loading v-if="isLoadingRecommendAnime && recommendAnimeList.length !== 0" m="-t-4" />
   </div>
 </template>
 
diff --git a/src/contentScripts/views/Anime/components/AnimeCard.vue b/src/contentScripts/views/Anime/components/AnimeCard.vue
new file mode 100644
index 00000000..53f75e9b
--- /dev/null
+++ b/src/contentScripts/views/Anime/components/AnimeCard.vue
@@ -0,0 +1,61 @@
+<script setup lang="ts">
+import { removeHttpFromUrl } from '~/utils'
+
+defineProps<{
+  url: string
+  cover: string
+  title: string
+  desc: string
+  capsuleText: string
+  rank?: number
+}>()
+</script>
+
+<template>
+  <div>
+    <a
+      rounded="$bew-radius" aspect="12/16" overflow-hidden mb-4 bg="$bew-fill-3" relative
+      :href="url" target="_blank"
+    >
+      <div
+        v-if="rank"
+        w-full
+        pos="absolute bottom-0"
+        text="white 7xl shadow-xl"
+        px-2
+        fw-bold
+        h-150px
+        flex
+        items-end
+        bg="gradient-to-b gradient-from-transparent gradient-to-[rgba(0,0,0,.6)]"
+        rounded-b="$bew-radius"
+      >
+        {{ rank }}
+      </div>
+      <img
+        :src="`${removeHttpFromUrl(cover)}@466w_622h.webp`"
+        :alt="title"
+        rounded="$bew-radius" aspect="12/16"
+      >
+    </a>
+    <p un-text="lg" my-4>
+      <a
+        :href="url"
+        target="_blank"
+        class="keep-two-lines"
+        :title="title"
+      >
+        {{ title }}
+      </a>
+    </p>
+    <div text="$bew-text-2" mb-10 flex items-center>
+      <div
+        text="$bew-theme-color" bg="$bew-theme-color-20"
+        p="x-3" h-27px lh-27px mr-2 rounded-4
+      >
+        {{ capsuleText }}
+      </div>
+      {{ desc }}
+    </div>
+  </div>
+</template>
diff --git a/src/contentScripts/views/Anime/components/AnimeCardSkeleton.vue b/src/contentScripts/views/Anime/components/AnimeCardSkeleton.vue
new file mode 100644
index 00000000..9fed1c76
--- /dev/null
+++ b/src/contentScripts/views/Anime/components/AnimeCardSkeleton.vue
@@ -0,0 +1,16 @@
+<template>
+  <div>
+    <div
+      rounded="$bew-radius" aspect="12/16" overflow-hidden mb-4 bg="$bew-fill-4"
+    />
+    <p w-full h-5 my-2 my-4 bg="$bew-fill-3" />
+    <div text="$bew-fill-2" mb-10 flex items-center>
+      <div
+        text="transparent" bg="$bew-fill-2" p="x-3 y-1" mr-2 h-27px rounded-4
+      >
+        0.0
+      </div>
+      <div w="60%" h-4 bg="$bew-fill-2" />
+    </div>
+  </div>
+</template>
diff --git a/src/contentScripts/views/Anime/types.ts b/src/contentScripts/views/Anime/types.ts
index 8e1c48a8..89f231a9 100644
--- a/src/contentScripts/views/Anime/types.ts
+++ b/src/contentScripts/views/Anime/types.ts
@@ -47,6 +47,7 @@ export interface AnimeItem {
     danmaku: number
     duration: number
     view: number
+    series_follow: number
   }
   sub_title: string
   subtitle: string
@@ -59,6 +60,7 @@ export interface AnimeItem {
   is_finish: 1 | 0 // 是否已經完結
   total_count: number // 當前集數
   styles: string[] // 番劇風格
+  rank: number
 }
 
 // https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/bangumi/timeline.md#%E8%8E%B7%E5%8F%96%E7%95%AA%E5%89%A7%E6%88%96%E5%BD%B1%E8%A7%86%E6%97%B6%E9%97%B4%E7%BA%BF