From 78235f0e3d0363f0d0a96e852513b53075309a7c Mon Sep 17 00:00:00 2001
From: PandaDEV <70103896+0PandaDEV@users.noreply.github.com>
Date: Mon, 2 Sep 2024 17:53:53 +1000
Subject: [PATCH] fixed types and icons

---
 components/Icons/Code.vue  | 11 -----------
 components/Icons/File.vue  | 11 -----------
 components/Icons/Image.vue | 11 -----------
 components/Icons/Text.vue  | 11 -----------
 pages/index.vue            | 23 ++++++++++++++---------
 public/icons/Code.svg      | 10 ++++++++++
 public/icons/File.svg      | 10 ++++++++++
 public/icons/Image.svg     | 10 ++++++++++
 public/icons/Text.svg      | 10 ++++++++++
 9 files changed, 54 insertions(+), 53 deletions(-)
 delete mode 100644 components/Icons/Code.vue
 delete mode 100644 components/Icons/File.vue
 delete mode 100644 components/Icons/Image.vue
 delete mode 100644 components/Icons/Text.vue
 create mode 100644 public/icons/Code.svg
 create mode 100644 public/icons/File.svg
 create mode 100644 public/icons/Image.svg
 create mode 100644 public/icons/Text.svg

diff --git a/components/Icons/Code.vue b/components/Icons/Code.vue
deleted file mode 100644
index b521a9f..0000000
--- a/components/Icons/Code.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-  <svg width="15px" height="18px" viewBox="0 0 15 18" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns="http://www.w3.org/2000/svg">
-    <g id="Code" fill-opacity="1">
-      <path d="M15 0L15 0L15 18L0 18L0 0L15 0Z" id="Code" fill="none" stroke="none" />
-      <path
-        d="M3.75 16.0714L11.25 16.0714C12.2855 16.0714 13.125 15.208 13.125 14.1429L13.125 8.02672C13.1248 7.5147 12.9269 7.02399 12.5748 6.66239L8.52375 2.493C8.17225 2.13169 7.69568 1.92868 7.19875 1.92857L3.75 1.92857C2.71447 1.92857 1.875 2.79202 1.875 3.85714L1.875 14.1429C1.875 15.208 2.71447 16.0714 3.75 16.0714M15 8.02672C15.0003 7.00424 14.6053 6.02271 13.9018 5.29904L9.85 1.13143C9.1465 0.406921 8.19178 -0.000123228 7.19625 0L3.75 0C1.67893 0 0 1.7269 0 3.85714L0 14.1429C2.98023e-07 16.2731 1.67893 18 3.75 18L11.25 18C13.3211 18 15 16.2731 15 14.1429L15 8.02672ZM8.4 12.2529C8.03443 11.8764 8.03443 11.2665 8.4 10.89L9.6125 9.64286L8.4 8.39571C8.0558 8.01577 8.06595 7.4237 8.42297 7.05648C8.77999 6.68927 9.35561 6.67882 9.725 7.03286L11.6 8.96143C11.9656 9.33791 11.9656 9.94781 11.6 10.3243L9.725 12.2529C9.35898 12.6289 8.76602 12.6289 8.4 12.2529M6.6 8.39571C6.9442 8.01577 6.93404 7.4237 6.57703 7.05649C6.22001 6.68927 5.64439 6.67882 5.275 7.03286L3.4 8.96143C3.03443 9.33791 3.03443 9.94781 3.4 10.3243L5.275 12.2529C5.50871 12.5108 5.86069 12.617 6.19286 12.5298C6.52502 12.4425 6.7844 12.1757 6.86923 11.8341C6.95406 11.4924 6.85081 11.1304 6.6 10.89L5.3875 9.64286L6.6 8.39571Z"
-        id="Shape" fill="#E5DFD5" fill-rule="evenodd" stroke="none" />
-    </g>
-  </svg>
-</template>
\ No newline at end of file
diff --git a/components/Icons/File.vue b/components/Icons/File.vue
deleted file mode 100644
index 97136c0..0000000
--- a/components/Icons/File.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-  <svg width="15px" height="18px" viewBox="0 0 15 18" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns="http://www.w3.org/2000/svg">
-    <g id="File" fill-opacity="1">
-      <path d="M15 0L15 0L15 18L0 18L0 0L15 0Z" id="File" fill="none" stroke="none" />
-      <path
-        d="M11.25 16.0714L3.75 16.0714C2.71447 16.0714 1.875 15.208 1.875 14.1429L1.875 3.85714C1.875 2.79202 2.71447 1.92857 3.75 1.92857L6.25 1.92857L6.25 5.14286C6.25 7.2731 7.92893 9 10 9L13.125 9L13.125 14.1429C13.125 15.208 12.2855 16.0714 11.25 16.0714M12.8788 7.07143C12.7961 6.92188 12.6944 6.78437 12.5763 6.66257L8.5225 2.493C8.40408 2.37151 8.2704 2.26687 8.125 2.18186L8.125 5.14286C8.125 6.20798 8.96447 7.07143 10 7.07143L12.8788 7.07143ZM13.9013 5.29843C14.6049 6.02193 15.0001 7.00338 15 8.02672L15 14.1429C15 16.2731 13.3211 18 11.25 18L3.75 18C1.67893 18 0 16.2731 0 14.1429L0 3.85714C-5.96046e-07 1.7269 1.67893 0 3.75 0L7.19625 0C8.19116 -0.000122309 9.14535 0.406423 9.84875 1.13014L13.9013 5.29843Z"
-        id="Shape" fill="#E5DFD5" fill-rule="evenodd" stroke="none" />
-    </g>
-  </svg>
-</template>
\ No newline at end of file
diff --git a/components/Icons/Image.vue b/components/Icons/Image.vue
deleted file mode 100644
index 42eca9f..0000000
--- a/components/Icons/Image.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-  <svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns="http://www.w3.org/2000/svg">
-    <g id="Image" fill-opacity="1">
-      <path d="M18 0L18 0L18 18L0 18L0 0L18 0Z" id="Image" fill="none" stroke="none" />
-      <path
-        d="M13.8462 2.07692L4.15385 2.07692C3.00679 2.07692 2.07692 3.00679 2.07692 4.15385L2.07692 11.1143L3.40892 10.1451C4.26934 9.51991 5.43685 9.5289 6.28754 10.1672L7.57246 11.1309L10.8512 8.32016C11.7843 7.52111 13.1676 7.54669 14.0705 8.37969L15.9231 10.0897L15.9231 4.15385C15.9231 3.00679 14.9932 2.07692 13.8462 2.07692M18 12.4588L18 4.15385C18 1.85974 16.1403 0 13.8462 0L4.15385 0C1.85974 0 0 1.85974 0 4.15385L0 13.8462C3.30118e-07 16.1403 1.85974 18 4.15385 18L13.8462 18C16.1403 18 18 16.1403 18 13.8462L18 12.4588ZM15.9231 12.9157L12.6623 9.90554C12.5333 9.78671 12.3358 9.78314 12.2026 9.89723L8.29108 13.2508L7.65831 13.7935L6.99231 13.2937L5.04 11.8302C4.91867 11.7398 4.75269 11.7386 4.63015 11.8274L2.07692 13.6814L2.07692 13.8462C2.07692 14.9932 3.00679 15.9231 4.15385 15.9231L13.8462 15.9231C14.9932 15.9231 15.9231 14.9932 15.9231 13.8462L15.9231 12.9157ZM8.30769 6.23077C8.30769 7.37782 7.37782 8.30769 6.23077 8.30769C5.08372 8.30769 4.15385 7.37782 4.15385 6.23077C4.15385 5.08372 5.08372 4.15385 6.23077 4.15385C7.37782 4.15385 8.30769 5.08372 8.30769 6.23077"
-        id="Shape" fill="#E5DFD5" fill-rule="evenodd" stroke="none" />
-    </g>
-  </svg>
-</template>
\ No newline at end of file
diff --git a/components/Icons/Text.vue b/components/Icons/Text.vue
deleted file mode 100644
index a35d18e..0000000
--- a/components/Icons/Text.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-  <svg width="15px" height="18px" viewBox="0 0 15 18" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns="http://www.w3.org/2000/svg">
-    <g id="Text" fill-opacity="1">
-      <path d="M15 0L15 0L15 18L0 18L0 0L15 0Z" id="Text" fill="none" stroke="none" />
-      <path
-        d="M3.75 16.0714L11.25 16.0714C12.2855 16.0714 13.125 15.208 13.125 14.1429L13.125 8.02672C13.1248 7.5147 12.9269 7.02399 12.5748 6.66239L8.52375 2.493C8.17225 2.13169 7.69568 1.92868 7.19875 1.92857L3.75 1.92857C2.71447 1.92857 1.875 2.79202 1.875 3.85714L1.875 14.1429C1.875 15.208 2.71447 16.0714 3.75 16.0714M15 8.02672C15.0003 7.00424 14.6053 6.02271 13.9018 5.29904L9.85 1.13143C9.1465 0.406921 8.19178 -0.000123228 7.19625 0L3.75 0C1.67893 0 0 1.7269 0 3.85714L0 14.1429C2.98023e-07 16.2731 1.67893 18 3.75 18L11.25 18C13.3211 18 15 16.2731 15 14.1429L15 8.02672ZM3.75 9.32143C3.75 8.78887 4.16973 8.35714 4.6875 8.35714L10.3125 8.35714C10.8303 8.35714 11.25 8.78887 11.25 9.32143C11.25 9.85399 10.8303 10.2857 10.3125 10.2857L4.6875 10.2857C4.16973 10.2857 3.75 9.85399 3.75 9.32143M4.6875 12.2143C4.35256 12.2143 4.04307 12.3981 3.8756 12.6964C3.70813 12.9948 3.70813 13.3624 3.8756 13.6607C4.04307 13.9591 4.35256 14.1429 4.6875 14.1429L7.8125 14.1429C8.14744 14.1429 8.45693 13.9591 8.6244 13.6607C8.79187 13.3624 8.79187 12.9948 8.6244 12.6964C8.45693 12.3981 8.14744 12.2143 7.8125 12.2143L4.6875 12.2143Z"
-        id="Shape" fill="#E5DFD5" fill-rule="evenodd" stroke="none" />
-    </g>
-  </svg>
-</template>
\ No newline at end of file
diff --git a/pages/index.vue b/pages/index.vue
index 76cc03e..ef412a1 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -35,13 +35,13 @@
           <template v-if="item.content_type === 'image'">
             <img v-if="!imageLoading && !imageLoadError" :src="getComputedImageUrl(item)" alt="Image" class="image"
               @error="onImageError">
-            <IconsImage v-if="imageLoading || imageLoadError" class="icon" />
+            <img v-if="imageLoading || imageLoadError" src="../public/icons/Image.svg" class="icon" />
           </template>
           <img v-else-if="hasFavicon(item.favicon ?? '')" :src="getFaviconFromDb(item.favicon ?? '')" alt="Favicon"
             class="favicon">
-          <IconsFile class="icon" v-else-if="item.content_type === 'files'" />
-          <IconsText class="icon" v-else-if="item.content_type === 'text'" />
-          <IconsCode class="icon" v-else-if="item.content_type === 'code'" />
+          <img src="../public/icons/File.svg" class="icon" v-else-if="item.content_type === 'files'" />
+          <img src="../public/icons/Text.svg" class="icon" v-else-if="item.content_type === 'text'" />
+          <img src="../public/icons/Code.svg" class="icon" v-else-if="item.content_type === 'code'" />
           <span v-if="item.content_type === 'image'">Image ({{ item.dimensions || 'Loading...' }})</span>
           <span v-else>{{ truncateContent(item.content) }}</span>
         </div>
@@ -366,8 +366,10 @@ const loadHistoryChunk = async (): Promise<void> => {
 const handleScroll = (): void => {
   if (!resultsContainer.value) return;
 
-  const { viewport } = resultsContainer.value?.osInstance().elements() ?? {};
-  const { scrollTop = 0, scrollHeight = 0, clientHeight = 0 } = viewport ?? {};
+  const viewport = resultsContainer.value?.osInstance()?.elements().viewport;
+  const scrollTop = viewport?.scrollTop ?? 0;
+  const scrollHeight = viewport?.scrollHeight ?? 0;
+  const clientHeight = viewport?.clientHeight ?? 0;
 
   if (scrollHeight - scrollTop - clientHeight < 100) {
     loadHistoryChunk();
@@ -418,6 +420,11 @@ const scrollToSelectedItem = (): void => {
   });
 };
 
+const onImageError = (): void => {
+  imageLoadError.value = true;
+  imageLoading.value = false;
+};
+
 watch([selectedGroupIndex, selectedItemIndex], scrollToSelectedItem);
 
 watch(searchQuery, () => {
@@ -428,9 +435,7 @@ onMounted(async () => {
   db.value = await Database.load('sqlite:data.db');
   await loadHistoryChunk();
 
-  if (resultsContainer.value) {
-    resultsContainer.value.osInstance().elements().viewport.addEventListener('scroll', handleScroll);
-  }
+  resultsContainer.value?.osInstance()?.elements()?.viewport?.addEventListener('scroll', handleScroll);
 
   await listen('tauri://focus', async () => {
     history.value = [];
diff --git a/public/icons/Code.svg b/public/icons/Code.svg
new file mode 100644
index 0000000..b5c1a42
--- /dev/null
+++ b/public/icons/Code.svg
@@ -0,0 +1,10 @@
+<svg width="15px" height="18px" viewBox="0 0 15 18" version="1.1"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns="http://www.w3.org/2000/svg">
+  <g id="Code" fill-opacity="1">
+    <path d="M15 0L15 0L15 18L0 18L0 0L15 0Z" id="Code" fill="none" stroke="none" />
+    <path
+      d="M3.75 16.0714L11.25 16.0714C12.2855 16.0714 13.125 15.208 13.125 14.1429L13.125 8.02672C13.1248 7.5147 12.9269 7.02399 12.5748 6.66239L8.52375 2.493C8.17225 2.13169 7.69568 1.92868 7.19875 1.92857L3.75 1.92857C2.71447 1.92857 1.875 2.79202 1.875 3.85714L1.875 14.1429C1.875 15.208 2.71447 16.0714 3.75 16.0714M15 8.02672C15.0003 7.00424 14.6053 6.02271 13.9018 5.29904L9.85 1.13143C9.1465 0.406921 8.19178 -0.000123228 7.19625 0L3.75 0C1.67893 0 0 1.7269 0 3.85714L0 14.1429C2.98023e-07 16.2731 1.67893 18 3.75 18L11.25 18C13.3211 18 15 16.2731 15 14.1429L15 8.02672ZM8.4 12.2529C8.03443 11.8764 8.03443 11.2665 8.4 10.89L9.6125 9.64286L8.4 8.39571C8.0558 8.01577 8.06595 7.4237 8.42297 7.05648C8.77999 6.68927 9.35561 6.67882 9.725 7.03286L11.6 8.96143C11.9656 9.33791 11.9656 9.94781 11.6 10.3243L9.725 12.2529C9.35898 12.6289 8.76602 12.6289 8.4 12.2529M6.6 8.39571C6.9442 8.01577 6.93404 7.4237 6.57703 7.05649C6.22001 6.68927 5.64439 6.67882 5.275 7.03286L3.4 8.96143C3.03443 9.33791 3.03443 9.94781 3.4 10.3243L5.275 12.2529C5.50871 12.5108 5.86069 12.617 6.19286 12.5298C6.52502 12.4425 6.7844 12.1757 6.86923 11.8341C6.95406 11.4924 6.85081 11.1304 6.6 10.89L5.3875 9.64286L6.6 8.39571Z"
+      id="Shape" fill="#E5DFD5" fill-rule="evenodd" stroke="none" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/public/icons/File.svg b/public/icons/File.svg
new file mode 100644
index 0000000..a0b4fdd
--- /dev/null
+++ b/public/icons/File.svg
@@ -0,0 +1,10 @@
+<svg width="15px" height="18px" viewBox="0 0 15 18" version="1.1"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns="http://www.w3.org/2000/svg">
+  <g id="File" fill-opacity="1">
+    <path d="M15 0L15 0L15 18L0 18L0 0L15 0Z" id="File" fill="none" stroke="none" />
+    <path
+      d="M11.25 16.0714L3.75 16.0714C2.71447 16.0714 1.875 15.208 1.875 14.1429L1.875 3.85714C1.875 2.79202 2.71447 1.92857 3.75 1.92857L6.25 1.92857L6.25 5.14286C6.25 7.2731 7.92893 9 10 9L13.125 9L13.125 14.1429C13.125 15.208 12.2855 16.0714 11.25 16.0714M12.8788 7.07143C12.7961 6.92188 12.6944 6.78437 12.5763 6.66257L8.5225 2.493C8.40408 2.37151 8.2704 2.26687 8.125 2.18186L8.125 5.14286C8.125 6.20798 8.96447 7.07143 10 7.07143L12.8788 7.07143ZM13.9013 5.29843C14.6049 6.02193 15.0001 7.00338 15 8.02672L15 14.1429C15 16.2731 13.3211 18 11.25 18L3.75 18C1.67893 18 0 16.2731 0 14.1429L0 3.85714C-5.96046e-07 1.7269 1.67893 0 3.75 0L7.19625 0C8.19116 -0.000122309 9.14535 0.406423 9.84875 1.13014L13.9013 5.29843Z"
+      id="Shape" fill="#E5DFD5" fill-rule="evenodd" stroke="none" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/public/icons/Image.svg b/public/icons/Image.svg
new file mode 100644
index 0000000..c177239
--- /dev/null
+++ b/public/icons/Image.svg
@@ -0,0 +1,10 @@
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns="http://www.w3.org/2000/svg">
+  <g id="Image" fill-opacity="1">
+    <path d="M18 0L18 0L18 18L0 18L0 0L18 0Z" id="Image" fill="none" stroke="none" />
+    <path
+      d="M13.8462 2.07692L4.15385 2.07692C3.00679 2.07692 2.07692 3.00679 2.07692 4.15385L2.07692 11.1143L3.40892 10.1451C4.26934 9.51991 5.43685 9.5289 6.28754 10.1672L7.57246 11.1309L10.8512 8.32016C11.7843 7.52111 13.1676 7.54669 14.0705 8.37969L15.9231 10.0897L15.9231 4.15385C15.9231 3.00679 14.9932 2.07692 13.8462 2.07692M18 12.4588L18 4.15385C18 1.85974 16.1403 0 13.8462 0L4.15385 0C1.85974 0 0 1.85974 0 4.15385L0 13.8462C3.30118e-07 16.1403 1.85974 18 4.15385 18L13.8462 18C16.1403 18 18 16.1403 18 13.8462L18 12.4588ZM15.9231 12.9157L12.6623 9.90554C12.5333 9.78671 12.3358 9.78314 12.2026 9.89723L8.29108 13.2508L7.65831 13.7935L6.99231 13.2937L5.04 11.8302C4.91867 11.7398 4.75269 11.7386 4.63015 11.8274L2.07692 13.6814L2.07692 13.8462C2.07692 14.9932 3.00679 15.9231 4.15385 15.9231L13.8462 15.9231C14.9932 15.9231 15.9231 14.9932 15.9231 13.8462L15.9231 12.9157ZM8.30769 6.23077C8.30769 7.37782 7.37782 8.30769 6.23077 8.30769C5.08372 8.30769 4.15385 7.37782 4.15385 6.23077C4.15385 5.08372 5.08372 4.15385 6.23077 4.15385C7.37782 4.15385 8.30769 5.08372 8.30769 6.23077"
+      id="Shape" fill="#E5DFD5" fill-rule="evenodd" stroke="none" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/public/icons/Text.svg b/public/icons/Text.svg
new file mode 100644
index 0000000..83f8532
--- /dev/null
+++ b/public/icons/Text.svg
@@ -0,0 +1,10 @@
+<svg width="15px" height="18px" viewBox="0 0 15 18" version="1.1"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns="http://www.w3.org/2000/svg">
+  <g id="Text" fill-opacity="1">
+    <path d="M15 0L15 0L15 18L0 18L0 0L15 0Z" id="Text" fill="none" stroke="none" />
+    <path
+      d="M3.75 16.0714L11.25 16.0714C12.2855 16.0714 13.125 15.208 13.125 14.1429L13.125 8.02672C13.1248 7.5147 12.9269 7.02399 12.5748 6.66239L8.52375 2.493C8.17225 2.13169 7.69568 1.92868 7.19875 1.92857L3.75 1.92857C2.71447 1.92857 1.875 2.79202 1.875 3.85714L1.875 14.1429C1.875 15.208 2.71447 16.0714 3.75 16.0714M15 8.02672C15.0003 7.00424 14.6053 6.02271 13.9018 5.29904L9.85 1.13143C9.1465 0.406921 8.19178 -0.000123228 7.19625 0L3.75 0C1.67893 0 0 1.7269 0 3.85714L0 14.1429C2.98023e-07 16.2731 1.67893 18 3.75 18L11.25 18C13.3211 18 15 16.2731 15 14.1429L15 8.02672ZM3.75 9.32143C3.75 8.78887 4.16973 8.35714 4.6875 8.35714L10.3125 8.35714C10.8303 8.35714 11.25 8.78887 11.25 9.32143C11.25 9.85399 10.8303 10.2857 10.3125 10.2857L4.6875 10.2857C4.16973 10.2857 3.75 9.85399 3.75 9.32143M4.6875 12.2143C4.35256 12.2143 4.04307 12.3981 3.8756 12.6964C3.70813 12.9948 3.70813 13.3624 3.8756 13.6607C4.04307 13.9591 4.35256 14.1429 4.6875 14.1429L7.8125 14.1429C8.14744 14.1429 8.45693 13.9591 8.6244 13.6607C8.79187 13.3624 8.79187 12.9948 8.6244 12.6964C8.45693 12.3981 8.14744 12.2143 7.8125 12.2143L4.6875 12.2143Z"
+      id="Shape" fill="#E5DFD5" fill-rule="evenodd" stroke="none" />
+  </g>
+</svg>
\ No newline at end of file