From 3baf423532f82f6913ef3da959a0e086bfd91389 Mon Sep 17 00:00:00 2001
From: Blossomi Shymae <87099578+BlossomiShymae@users.noreply.github.com>
Date: Sat, 12 Oct 2024 08:40:08 -0500
Subject: [PATCH] Add lazy image loading, fix bugs

---
 components/LLazyImg.vue          | 27 +++++++++++++++++++++++++++
 nuxt.config.ts                   |  5 +++++
 package-lock.json                |  7 +++++++
 package.json                     |  1 +
 pages/champions/index.vue        |  6 ++----
 pages/cherry-augments/index.vue  |  6 +++---
 pages/companions/index.vue       |  4 ++--
 pages/items/index.vue            |  6 +++---
 pages/loots/index.vue            |  4 ++--
 pages/summoner-emotes/index.vue  |  8 ++++----
 pages/summoner-icons/index.vue   |  6 +++---
 pages/tft-damage-skins/index.vue |  6 +++---
 pages/tft-map-skins/index.vue    |  4 ++--
 pages/ward-skins/index.vue       | 12 +++++-------
 14 files changed, 69 insertions(+), 33 deletions(-)
 create mode 100644 components/LLazyImg.vue

diff --git a/components/LLazyImg.vue b/components/LLazyImg.vue
new file mode 100644
index 0000000..9683da6
--- /dev/null
+++ b/components/LLazyImg.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+import 'ldrs/dotStream';
+
+const props = defineProps<{
+  src: string | undefined,
+  imgClass?: string
+}>();
+
+const source = ref(props.src);
+const loading = ref(true);
+</script>
+
+<template>
+  <div class="d-flex justify-content-center align-items-center"> 
+    <l-dot-stream v-if="loading"
+      class="w-100 h-100"
+      size="60"
+      speed="2.5"
+      color="#FBDCFB" />
+    <img
+      :src="source"
+      :class="`w-100 h-100 ${imgClass ?? ''}`"
+      loading="lazy" 
+      v-on:load="loading = false;" 
+      v-on:error="loading = false; source = '/clean-cuts/img/error.png';" />
+  </div>
+</template>
\ No newline at end of file
diff --git a/nuxt.config.ts b/nuxt.config.ts
index cdaf7ec..cbfce8d 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -2,6 +2,11 @@
 export default defineNuxtConfig({
   devtools: { enabled: true },
   ssr: false,
+  vue: {  
+    compilerOptions: {
+      isCustomElement: (tag) => ['l-dot-stream'].includes(tag),
+    },
+  },
   app: {
     baseURL: "/clean-cuts/",
     pageTransition: {
diff --git a/package-lock.json b/package-lock.json
index 862afb7..df8f4bc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
       "dependencies": {
         "aos": "^2.3.4",
         "axios": "^1.6.8",
+        "ldrs": "^1.0.2",
         "nuxt": "^3.11.2",
         "nuxt-app": "file:",
         "vue": "^3.4.21",
@@ -4943,6 +4944,12 @@
         "safe-buffer": "~5.1.0"
       }
     },
+    "node_modules/ldrs": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/ldrs/-/ldrs-1.0.2.tgz",
+      "integrity": "sha512-sYJmivdkIiHrUEqTrEWccBoLdaENpzbzkABI5rk8rRxTXrg9i2xVuDvUUuhOhJY3RmQyaoxs046pM1DCRdcIpg==",
+      "license": "MIT"
+    },
     "node_modules/lilconfig": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
diff --git a/package.json b/package.json
index 5201cba..15df014 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "aos": "^2.3.4",
     "axios": "^1.6.8",
+    "ldrs": "^1.0.2",
     "nuxt": "^3.11.2",
     "nuxt-app": "file:",
     "vue": "^3.4.21",
diff --git a/pages/champions/index.vue b/pages/champions/index.vue
index 88c6efe..7aa6af9 100644
--- a/pages/champions/index.vue
+++ b/pages/champions/index.vue
@@ -17,15 +17,13 @@ watch(currentLocale, async () => {
 <template>
   <div class="d-flex flex-column gap-4">
     <div class="d-flex flex-row flex-wrap gap-4 justify-content-center">
-        <div v-for="summary in summaries" :id="`${summary.id}`" 
+        <div v-for="summary in summaries" :key="`${summary.id}`" 
             style="width: 200px;"
             data-aos="zoom-out"
             data-aos-duration="500">
             <NuxtLink :to="`/champions/${summary.id}`">
                 <div class="ratio ratio-16x9 position-relative trans-hover-grow">
-                    <img class="object-fit-cover rounded" 
-                        :src="skins.find(x => (x.id / 1000) == summary.id)?.getTile({locale: currentLocale, version: 'latest'})"
-                        loading="lazy"/>
+                    <LLazyImg class="object-fit-cover rounded" img-class="object-fit-cover rounded" :src="skins.find(x => (x.id / 1000) == summary.id)?.getTile({locale: currentLocale, version: 'latest'})"/>
                     <div class="position-absolute z-1 d-flex flex-column justify-content-end">
                         <div class="d-inline-flex justify-content-between align-items-center px-2 bg-dark-gradient rounded-bottom">
                             <span class="fs-5 fw-light">{{ summary.name }}</span>
diff --git a/pages/cherry-augments/index.vue b/pages/cherry-augments/index.vue
index 2f7e5e7..b264ac9 100644
--- a/pages/cherry-augments/index.vue
+++ b/pages/cherry-augments/index.vue
@@ -35,14 +35,14 @@ const filteredCherryAugments = computed(() => {
     </div>
 
     <div class="d-flex flex-wrap justify-content-around gap-4">
-      <div v-for="cherryAugment in filteredCherryAugments" :id="`${cherryAugment.id}-${cherryAugment.nameTRA}`"
+      <div v-for="cherryAugment in filteredCherryAugments" :key="`${cherryAugment.id}-${cherryAugment.nameTRA}`"
         style="width: 200px;"
         data-aos="zoom-out"
         data-aos-duration="500">
         <div class="ratio ratio-1x1 position-relative trans-hover-grow">
-          <img class="rounded app-background p-4" :src="cherryAugment.getAugmentSmallIcon('latest')" loading="lazy"/>
+          <LLazyImg class="rounded app-background" img-class="rounded app-background" :src="cherryAugment.getAugmentSmallIcon('latest')"/>
           <div class="position-absolute z-1 d-flex flex-column justify-content-end">
-            <div class="d-inline-flex justify-content-between align-items-center p-1" style="background: #0008;" >
+            <div class="d-inline-flex justify-content-between align-items-center p-1 bg-dark-gradient" >
               <span class="fs-6 fw-light ">{{ cherryAugment.nameTRA }}</span>
               <span class="fw-bold rounded">{{ cherryAugment.id }}</span>
             </div>
diff --git a/pages/companions/index.vue b/pages/companions/index.vue
index c3dac3a..7024d74 100644
--- a/pages/companions/index.vue
+++ b/pages/companions/index.vue
@@ -40,11 +40,11 @@ const p = computed(() => {
     </div>
 
     <div class="d-flex flex-row flex-wrap justify-content-center gap-4">
-      <div style="width: 350px;" v-for="companion in p.pages[p.index.value]"
+      <div style="width: 350px;" v-for="companion in p.pages[p.index.value]" :key="companion.itemId"
         data-aos="zoom-out"
         data-aos-duration="500">
         <div class="ratio ratio-16x9 position-relative trans-hover-grow">
-          <img class="object-fit-cover rounded" :src="companion.getLoadoutsIcon('latest')" loading="lazy" />
+          <LLazyImg class="object-fit-cover rounded" img-class="object-fit-cover rounded" :src="companion.getLoadoutsIcon('latest')" />
           <div class="position-absolute z-1 d-flex flex-column justify-content-end">
             <div class="d-inline-flex justify-content-between align-items-center p-2 bg-dark-gradient rounded">
               <span class="fs-6">{{ companion.name }}</span>
diff --git a/pages/items/index.vue b/pages/items/index.vue
index 62a7bdd..b67aa1e 100644
--- a/pages/items/index.vue
+++ b/pages/items/index.vue
@@ -12,16 +12,16 @@ watch(currentLocale, async () => {
 <template>
   <div class="d-flex flex-column gap-4">
     <div class="d-flex flex-row flex-wrap gap-2 justify-content-center">
-        <div v-for="item in items" :id="`${item.id}`"
+        <div v-for="item in items" :key="`${item.id}`"
             style="width: 64px;"
             data-aos="zoom-out"
             data-aos-duration="500">
             <NuxtLink :to="`/items/${item.id}`">
                 <div class="ratio ratio-1x1 position-relative trans-hover-grow">
-                    <img class="rounded" :src="item.getIcon('latest')" loading="lazy"/>
+                    <LLazyImg class="rounded" img-class="rounded" :src="item.getIcon('latest')" />
                     <div class="position-absolute z-1 d-flex flex-column justify-content-end">
                         <div class="d-inline-flex justify-content-end align-items-center">
-                            <span class="fw-bold bg-dark-subtle rounded m-1" style="font-size: 8pt; padding: 1px;">{{ item.id }}</span>
+                            <span class="fw-bold rounded m-1 px-1" style="font-size: 8pt; padding: 1px; background: #000C;">{{ item.id }}</span>
                         </div>
                     </div>
                 </div>
diff --git a/pages/loots/index.vue b/pages/loots/index.vue
index 4b1314d..eb5ec0d 100644
--- a/pages/loots/index.vue
+++ b/pages/loots/index.vue
@@ -69,11 +69,11 @@ watch(currentLocale, async() => {
     </div>
 
     <div class="d-flex flex-wrap justify-content-center gap-4">
-      <div style="width: 225px;" v-for="loot in p.pages[p.index.value]" :id="`${loot.id}`"
+      <div style="width: 225px;" v-for="loot in p.pages[p.index.value]" :key="`${loot.id}`"
         data-aos="zoom-out"
         data-aos-duration="500">
         <div class="ratio ratio-1x1 position-relative trans-hover-grow">
-          <img class="app-background rounded" :src="loot.getImage('latest')" loading="lazy"/>
+          <LLazyImg class="app-background rounded" img-class="app-background rounded" :src="getLootImage(loot)" />
           <div class="position-absolute z-1 d-flex flex-column justify-content-end">
             <div class="d-inline-flex justify-content-between align-items-end bg-dark-gradient rounded p-2">
               <span>{{ loot.name }}</span>
diff --git a/pages/summoner-emotes/index.vue b/pages/summoner-emotes/index.vue
index a44e75b..4905111 100644
--- a/pages/summoner-emotes/index.vue
+++ b/pages/summoner-emotes/index.vue
@@ -37,15 +37,15 @@ const p = computed(() => {
       </div>
     </div>
     <div class="d-flex flex-wrap justify-content-center gap-4">
-      <div style="width: 200px;" v-for="summonerEmote in p.pages[p.index.value]"
+      <div style="width: 200px;" v-for="summonerEmote in p.pages[p.index.value]" :key="`${summonerEmote.id}`"
         data-aos="zoom-out"
         data-aos-duration="500">
         <div class="ratio ratio-1x1 position-relative trans-hover-grow">
-          <img class="app-backgroud rounded" :src="summonerEmote.getInventoryIcon('latest')" loading="lazy"/>
+          <LLazyImg class="app-background rounded" :src="summonerEmote.getInventoryIcon('latest')"/>
           <div class="position-absolute z-1 d-flex flex-column justify-content-end">
-            <div class="d-inline-flex justify-content-between bg-dark-gradient p-1 m-2 rounded-bottom">
+            <div class="d-inline-flex justify-content-between bg-dark-gradient p-2 rounded-bottom">
               <span>{{ summonerEmote.name }}</span>
-              <span>{{ summonerEmote.id }}</span>
+              <span class="fw-bold">{{ summonerEmote.id }}</span>
             </div>
           </div>
         </div>
diff --git a/pages/summoner-icons/index.vue b/pages/summoner-icons/index.vue
index 4b3901d..cdcb047 100644
--- a/pages/summoner-icons/index.vue
+++ b/pages/summoner-icons/index.vue
@@ -38,11 +38,11 @@ const p = computed(() => {
     </div>
 
     <div class="d-flex flex-wrap justify-content-center gap-4">
-        <div style="width: 200px;" v-for="summonerIcon in p.pages[p.index.value]"
+        <div style="width: 200px;" v-for="summonerIcon in p.pages[p.index.value]" :key="summonerIcon.id"
             data-aos="zoom-out"
             data-aos-duration="500">
             <div class="ratio ratio-1x1 position-relative trans-hover-grow">
-                <img :src="summonerIcon.getImage('latest')" loading="lazy" class="rounded"/>
+                <LLazyImg :src="summonerIcon.getImage('latest')" class="rounded" img-class="rounded"/>
                 <div class="position-absolute z-1 d-flex flex-column justify-content-end">
                     <div class="d-inline-flex justify-content-between align-items-end bg-dark-gradient rounded-bottom p-2">
                         <span>{{ summonerIcon.title }}</span>
@@ -52,7 +52,7 @@ const p = computed(() => {
                 <div class="position-absolute z-2 d-flex flex-column justify-content-start align-items-end">
                     <div class="d-inline-flex justify-content-end gap-1 m-1">
                         <span style="background: #0008; padding: 1px;" class="px-1 rounded">{{ summonerIcon.yearReleased }}</span>
-                        <span v-if="summonerIcon.isLegacy" class="px-1 rounded" style="background: #0008; padding: 1px;">{{ summonerIcon.isLegacy }}</span>
+                        <span v-if="summonerIcon.isLegacy" class="px-1 rounded" style="background: #0008; padding: 1px;">Legacy</span>
                         <span v-if="summonerIcon.rarities && summonerIcon.rarities.length > 0 && summonerIcon.rarities[0].rarity != '0'" class="px-1 rounded" style="background: #0008; padding: 1px;">{{ summonerIcon.rarities[0].rarity }}</span>
                     </div>
                 </div>
diff --git a/pages/tft-damage-skins/index.vue b/pages/tft-damage-skins/index.vue
index 6386ff6..c270797 100644
--- a/pages/tft-damage-skins/index.vue
+++ b/pages/tft-damage-skins/index.vue
@@ -18,7 +18,7 @@ const p = computed(() => {
     filtered = tftDamageSkins.value.filter((x) => x.itemId == parseInt(query.value));
   else
     filtered = tftDamageSkins.value.filter((x) => x.name.toLowerCase().includes(query.value.toLowerCase()));
-  return usePagination(filtered, 24);
+  return filtered;
 })
 </script>
 
@@ -35,11 +35,11 @@ const p = computed(() => {
     </div>
 
     <div class="d-flex flex-wrap gap-4 justify-content-center">
-      <div style="width: 200px;" v-for="tftDamageSkin in tftDamageSkins" :id="`${tftDamageSkin.itemId}`"
+      <div style="width: 200px;" v-for="tftDamageSkin in p" :key="`${tftDamageSkin.itemId}`"
         data-aos="zoom-out"
         data-aos-duration="500">
         <div class="ratio ratio-1x1 position-relative trans-hover-grow">
-          <img class="rounded" :src="tftDamageSkin.getLoadoutsIcon('latest')" loading="lazy"/>
+          <LLazyImg class="rounded" img-class="rounded" :src="tftDamageSkin.getLoadoutsIcon('latest')"/>
           <div class="position-absolute z-1 d-flex flex-column justify-content-end">
             <div class="d-inline-flex justify-content-between align-items-end bg-dark-gradient p-2">
               <span>{{ tftDamageSkin.name }}</span>
diff --git a/pages/tft-map-skins/index.vue b/pages/tft-map-skins/index.vue
index 1762432..12b805e 100644
--- a/pages/tft-map-skins/index.vue
+++ b/pages/tft-map-skins/index.vue
@@ -34,11 +34,11 @@ const p = computed(() => {
       </div>
     </div>
     <div class="d-flex flex-wrap justify-content-center gap-4">
-      <div style="width: 350px;" v-for="tftMapSkin in tftMapSkins" :id="`${tftMapSkin.itemId}`"
+      <div style="width: 350px;" v-for="tftMapSkin in p" :key="`${tftMapSkin.itemId}`"
         data-aos="zoom-out"
         data-aos-duration="500">
         <div class="ratio ratio-4x3 position-relative trans-hover-grow">
-          <img class="object-fit-cover rounded" :src="tftMapSkin.getLoadoutsIcon('latest')" loading="lazy"/>
+          <LLazyImg class="object-fit-cover rounded" img-class="object-fit-cover rounded" :src="tftMapSkin.getLoadoutsIcon('latest')"/>
           <div class="position-absolute z-1 d-flex flex-column justify-content-end">
             <div class="d-inline-flex justify-content-between align-items-end bg-dark-gradient p-2 rounded">
               <div class="d-flex flex-column">
diff --git a/pages/ward-skins/index.vue b/pages/ward-skins/index.vue
index 832441e..bdbb539 100644
--- a/pages/ward-skins/index.vue
+++ b/pages/ward-skins/index.vue
@@ -18,7 +18,7 @@ const p = computed(() => {
     else 
         filtered = skins.value.filter((x) => x.name.toLowerCase().includes(query.value.toLowerCase()));
 
-    return usePagination(filtered, 100);
+    return filtered;
 });
 
 const rarities = {
@@ -35,8 +35,6 @@ const rarities = {
         <Card class="d-flex justify-content-center align-items-center me-auto">
             <span>{{ skins.length }} skins</span>
         </Card>
-        <Pagination :pages="p.pages" :count="p.count" :index="p.index.value" :on-prev="p.prev" :on-next="p.next"
-            :on-first="p.first" :on-last="p.last" style="min-width: 300px;"/>
         <div class="input-group" style="max-width: 400px;">
             <input type="text" class="form-control border-light border-opacity-25" placeholder="Search" name="Search"
                 v-model="query"/>
@@ -44,15 +42,15 @@ const rarities = {
       </div>
       
       <div class="d-flex flex-row flex-wrap gap-4 justify-content-center">
-        <div v-for="wardSkin in p.pages[p.index.value]" :id="`${wardSkin.id}`"
+        <div v-for="wardSkin in p" :key="`${wardSkin.id}`"
             style="width: 225px;"
             data-aos="zoom-out"
             data-aos-duration="500">
             <div class="ratio ratio-1x1 position-relative trans-hover-grow">
-                <img class="rounded app-background p-4" :src="wardSkin.getWardShadowImage('latest')" loading="lazy"/>
-                <img class="rounded p-4" :src="wardSkin.getWardImage('latest')" loading="lazy"/>
+                <LLazyImg class="rounded app-background" img-class="rounded app-background" :src="wardSkin.getWardShadowImage('latest')"/>
+                <LLazyImg class="rounded" :src="wardSkin.getWardImage('latest')"/>
                 <div class="position-absolute z-1 d-flex flex-column justify-content-end">
-                    <div class="d-inline-flex justify-content-between align-item-between p-1 rounded-bottom" style="background: #0008;">
+                    <div class="d-inline-flex justify-content-between align-item-between p-1 rounded-bottom bg-dark-gradient">
                         <span class="fs-6 fw-light">{{ wardSkin.name }}</span>
                         <span class="fw-bold">{{ wardSkin.id }}</span>
                     </div>