From f5c7663767656c232967a2fe342f382c1609f27a Mon Sep 17 00:00:00 2001
From: Mindfreak9100 <dhoom_rik@yahoo.com>
Date: Wed, 28 Sep 2022 16:36:56 -0400
Subject: [PATCH] Move resolveIcon func to utils for reusability

---
 src/components/services/group.jsx |  5 +++--
 src/components/services/item.jsx  | 17 +----------------
 src/utils/icon-resolver.js        | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 src/utils/icon-resolver.js

diff --git a/src/components/services/group.jsx b/src/components/services/group.jsx
index 7fc86907..a963181c 100644
--- a/src/components/services/group.jsx
+++ b/src/components/services/group.jsx
@@ -1,7 +1,8 @@
-import classNames from "classnames";
 import Image from "next/future/image";
+import classNames from "classnames";
 
 import List from "components/services/list";
+import { resolveIcon } from "utils/icon-resolver";
 
 export default function ServicesGroup({ services, layout }) {
   return (
@@ -14,7 +15,7 @@ export default function ServicesGroup({ services, layout }) {
     >
       <div className="flex select-none">
       {services.icon &&
-        <Image src={services.icon} width={32} height={32} alt="logo" className="flex-shrink-0 flex items-center justify-center w-10"/>
+        <Image src={resolveIcon(services.icon)} width={32} height={32} alt="logo" className="flex-shrink-0 flex items-center justify-center w-10"/>
       }
         <h2 className={services.icon ? "text-theme-800 dark:text-theme-300 text-xl font-medium flex-1 flex items-center justify-between rounded-r-md flex-1 px-2 py-2 text-sm text-left" : "text-theme-800 dark:text-theme-300 text-xl font-medium h2-title-noicon"}>{services.name}</h2>
       </div>
diff --git a/src/components/services/item.jsx b/src/components/services/item.jsx
index 82f3741c..9d093bef 100644
--- a/src/components/services/item.jsx
+++ b/src/components/services/item.jsx
@@ -7,22 +7,7 @@ import Widget from "./widget";
 import Docker from "./widgets/service/docker";
 
 import { SettingsContext } from "utils/settings-context";
-
-function resolveIcon(icon) {
-  if (icon.startsWith("http")) {
-    return `/api/proxy?url=${encodeURIComponent(icon)}`;
-  }
-
-  if (icon.startsWith("/")) {
-    return icon;
-  }
-
-  if (icon.endsWith(".png")) {
-    return `https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons/png/${icon}`;
-  }
-
-  return `https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons/png/${icon}.png`;
-}
+import { resolveIcon } from "utils/icon-resolver";
 
 export default function Item({ service }) {
   const hasLink = service.href && service.href !== "#";
diff --git a/src/utils/icon-resolver.js b/src/utils/icon-resolver.js
new file mode 100644
index 00000000..0a7f1211
--- /dev/null
+++ b/src/utils/icon-resolver.js
@@ -0,0 +1,15 @@
+export function resolveIcon(icon) {
+    if (icon.startsWith("http")) {
+        return `/api/proxy?url=${encodeURIComponent(icon)}`;
+    }
+
+    if (icon.startsWith("/")) {
+        return icon;
+    }
+
+    if (icon.endsWith(".png")) {
+        return `https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons/png/${icon}`;
+    }
+
+    return `https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons/png/${icon}.png`;
+}
\ No newline at end of file