From 4b90ae622ff41fbee71bdff5ac783da566708f61 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Sun, 4 Apr 2021 19:29:44 +0100
Subject: [PATCH] Added option to use site favicon as icon, and refactored icon
 comp into new file

---
 src/components/Item.vue     | 51 ++++----------------
 src/components/ItemIcon.vue | 92 +++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 42 deletions(-)
 create mode 100644 src/components/ItemIcon.vue

diff --git a/src/components/Item.vue b/src/components/Item.vue
index 77db4422..525e2d45 100644
--- a/src/components/Item.vue
+++ b/src/components/Item.vue
@@ -6,11 +6,12 @@
                 <span class="text">{{ title }}</span>
                 <div class="overflow-dots">...</div>
             </div>
-            <img
+            <icon :icon="icon" :url="url" />
+            <!-- <img
                 v-if="icon"
-                :src="getAppropriateImgPath(icon)"
+                :src="getAppropriateImgPath(icon, url)"
                 class="tile-icon"
-            />
+            /> -->
             <!-- <img
                 v-else-if="iconType === 'svg' && icon"
                 :src="`/img/item-icons/tile-svgs/${icon}.svg`"
@@ -27,6 +28,8 @@
 
 <script>
 
+import Icon from '@/components/ItemIcon.vue';
+
 export default {
   name: 'Item',
   props: {
@@ -49,46 +52,10 @@ export default {
       getId: this.id,
     };
   },
+  components: {
+    Icon,
+  },
   methods: {
-    /* Returns true if a string is in URL format. Used to identify tile icon source */
-    isUrl(str) {
-      const pattern = new RegExp(/(http|https):\/\/(\w+:{0,1}\w*)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%!\-/]))?/);
-      return pattern.test(str);
-    },
-    /* Checks if the icon is from a local image, remote URL, SVG or font-awesome */
-    getAppropriateImgPath(img) {
-      const imageType = this.determineImageType(img);
-      switch (imageType) {
-        case 'url':
-          return img;
-        case 'img':
-          return `/img/item-icons/tile-icons/${img}`;
-        case 'svg':
-          return img;
-        case 'fas':
-          return img;
-        default:
-          return '';
-      }
-    },
-    /* Checks if the icon is from a local image, remote URL, SVG or font-awesome */
-    determineImageType(img) {
-      const fileExtRegex = /(?:\.([^.]+))?$/;
-      const validImgExtensions = ['png', 'jpg'];
-      let imgType = '';
-      if (this.isUrl(img)) {
-        imgType = 'url';
-      } else if (validImgExtensions.includes(fileExtRegex.exec(img)[1])) {
-        imgType = 'img';
-      } else if (fileExtRegex.exec(img)[1] === 'svg') {
-        imgType = 'svg';
-      } else if (img.include('fas')) {
-        imgType = 'fas';
-      } else {
-        imgType = 'none';
-      }
-      return imgType;
-    },
     /* Called when an item is opened, so that search field can be reset */
     itemOpened() {
       this.$emit('itemClicked');
diff --git a/src/components/ItemIcon.vue b/src/components/ItemIcon.vue
new file mode 100644
index 00000000..f0e4c2a3
--- /dev/null
+++ b/src/components/ItemIcon.vue
@@ -0,0 +1,92 @@
+<template>
+  <img
+      v-if="icon"
+      :src="getAppropriateImgPath(icon, url)"
+      class="tile-icon"
+  />
+</template>
+
+<script>
+
+export default {
+  name: 'Item',
+  props: {
+    icon: String,
+    url: String,
+  },
+  methods: {
+    /* Check if a string is in a URL format. Used to identify tile icon source */
+    isUrl(str) {
+      const pattern = new RegExp(/(http|https):\/\/(\w+:{0,1}\w*)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%!\-/]))?/);
+      return pattern.test(str);
+    },
+    /* Returns true if the input is a path to an image file */
+    isImage(img) {
+      const fileExtRegex = /(?:\.([^.]+))?$/;
+      const validImgExtensions = ['png', 'jpg'];
+      const splitPath = fileExtRegex.exec(img);
+      if (splitPath.length >= 1) return validImgExtensions.includes(splitPath[1]);
+      return false;
+    },
+    /* Get favicon URL, for items which use the favicon as their icon */
+    getFavicon(fullUrl) {
+      const isLocalIP = /(127\.)|(192\.168\.)|(10\.)|(172\.1[6-9]\.)|(172\.2[0-9]\.)|(172\.3[0-1]\.)|(::1$)|([fF][cCdD])|(localhost)/;
+      if (isLocalIP.test(fullUrl)) { // Check if using a local IP format or localhost
+        const urlParts = fullUrl.split('/');
+        // For locally running services, use the default path for favicon
+        if (urlParts.length >= 2) return `${urlParts[0]}/${urlParts[1]}/${urlParts[2]}/favicon.ico`;
+      } else if (fullUrl.includes('http')) {
+        // For publicly accessible sites, a more reliable method is using Google's API
+        return `https://s2.googleusercontent.com/s2/favicons?domain=${fullUrl}`;
+      }
+      return '';
+    },
+    /* Checks if the icon is from a local image, remote URL, SVG or font-awesome */
+    getAppropriateImgPath(img, url) {
+      const imageType = this.determineImageType(img);
+      switch (imageType) {
+        case 'url':
+          return img;
+        case 'img':
+          return `/img/item-icons/tile-icons/${img}`;
+        case 'favicon':
+          return this.getFavicon(url);
+        case 'svg':
+          return img;
+        case 'fas':
+          return img;
+        default:
+          return '';
+      }
+    },
+    /* Checks if the icon is from a local image, remote URL, SVG or font-awesome */
+    determineImageType(img) {
+      let imgType = '';
+      if (this.isUrl(img)) {
+        imgType = 'url';
+      } else if (this.isImage(img)) {
+        imgType = 'img';
+      // } else if (fileExtRegex.exec(img)[1] === 'svg') {
+      //   imgType = 'svg';
+      } else if (img.includes('fas')) {
+        imgType = 'fas';
+      } else if (img === 'favicon') {
+        imgType = 'favicon';
+      } else {
+        imgType = 'none';
+      }
+      return imgType;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import '../../src/styles/color-pallet.scss';
+
+.tile-icon {
+    width: 60px;
+    filter: drop-shadow(2px 4px 6px $transparent-black) saturate(0.65);
+}
+
+</style>