added sorting by relevance

PPLBandage · Nov 23, 2024 · 605566d · 605566d
1 parent 39dc808
commit 605566d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 23 deletions.
diff --git a/src/app/modules/components/asyncImage.module.ts b/src/app/modules/components/asyncImage.module.ts
@@ -4,15 +4,15 @@ const AsyncImage = (src: string): Promise<HTMLImageElement> =>
         img.src = src;
 
         img.onload = () => resolve(img);
-        img.onerror = () => reject(new Error("Failed to load image"));
+        img.onerror = reject;
     });
 
 export const base64Encode = (img: HTMLImageElement) => {
     const canvas = document.createElement('canvas');
     const ctx = canvas.getContext('2d');
     canvas.height = img.naturalHeight;
     canvas.width = img.naturalWidth;
-    ctx.drawImage(this, 0, 0);
+    ctx.drawImage(img, 0, 0);
     return canvas.toDataURL();
 }
 

diff --git a/src/app/modules/components/search.module.tsx b/src/app/modules/components/search.module.tsx
@@ -20,9 +20,10 @@ const options: readonly { value: number, label: String }[] = [
 ];
 
 const options_sortir: readonly { value: string, label: String }[] = [
-    { value: 'popular_up', label: "По популярности" },
-    { value: 'date_up', label: "По дате создания" },
-    { value: 'name_up', label: "По имени" }
+    { value: 'popular_up', label: 'По популярности' },
+    { value: 'relevant_up', label: 'По релевантности' },
+    { value: 'date_up', label: 'По дате создания' },
+    { value: 'name_up', label: 'По имени' }
 ];
 
 interface SearchProps {

diff --git a/src/app/workshop/[id]/bandage_engine.module.ts b/src/app/workshop/[id]/bandage_engine.module.ts
@@ -1,6 +1,5 @@
-import asyncImage from '@/app/modules/components/asyncImage.module';
+import asyncImage, { base64Encode } from '@/app/modules/components/asyncImage.module';
 import ApiManager from '@/app/modules/utils/apiManager';
-import axios from 'axios';
 
 interface SkinResponse {
     data: {
@@ -104,23 +103,19 @@ class Client {
     }
 
     loadSkinUrl(url: string) {
-        axios.get(url, { responseType: 'blob' }).then((result => {
-            if (result.status === 200) {
-                const reader = new FileReader();
-                reader.onloadend = () => {
-                    this.setOriginalCanvas(reader.result as string);
-
-                    this.addEventListener("onload", () => {
-                        this.skin = reader.result as string;
-                        this.rerender();
-                        this.removeEventListener("onload");
-                    });
-                }
-                reader.readAsDataURL(result.data);
-            }
-        }))
-    }
+        asyncImage(url)
+            .then(img => {
+                const base64 = base64Encode(img);
+                this.setOriginalCanvas(base64);
 
+                this.addEventListener("onload", () => {
+                    this.skin = base64;
+                    this.rerender();
+                    this.removeEventListener("onload");
+                });
+            })
+            .catch(console.error);
+    }
 
     triggerEvent(property: string) {
         if (property === 'rerender' || this.listeners[property]) {