From f1654d14adb2a7d3595b02ab47e099b7fe07723c Mon Sep 17 00:00:00 2001
From: Daniel Stock <daniel.stock@tooloop.de>
Date: Wed, 29 May 2024 10:09:11 +0200
Subject: [PATCH] Add app icon

---
 forge.config.js       | 17 +++++++----------
 images/icon-1024.icns |  3 +++
 images/icon-1024.png  |  3 +++
 images/icon-512.png   |  3 +++
 main.js               |  5 +++--
 package-lock.json     | 19 ++++++++++++++++++-
 package.json          |  5 +++--
 7 files changed, 40 insertions(+), 15 deletions(-)
 create mode 100644 images/icon-1024.icns
 create mode 100644 images/icon-1024.png
 create mode 100644 images/icon-512.png

diff --git a/forge.config.js b/forge.config.js
index fa4a113..2037475 100644
--- a/forge.config.js
+++ b/forge.config.js
@@ -4,24 +4,21 @@ const { FuseV1Options, FuseVersion } = require('@electron/fuses');
 module.exports = {
   packagerConfig: {
     asar: true,
+    icon: 'images/icon-1024.icns'
   },
   rebuildConfig: {},
   makers: [
-    {
-      name: '@electron-forge/maker-squirrel',
-      config: {},
-    },
     {
       name: '@electron-forge/maker-zip',
-      platforms: ['darwin'],
+      platforms: ['darwin', 'linux'],
     },
     {
       name: '@electron-forge/maker-deb',
-      config: {},
-    },
-    {
-      name: '@electron-forge/maker-rpm',
-      config: {},
+      config: {
+        options: {
+          icon: 'images/icon-512.png'
+        }
+      },
     },
   ],
   plugins: [
diff --git a/images/icon-1024.icns b/images/icon-1024.icns
new file mode 100644
index 0000000..74bf1c5
--- /dev/null
+++ b/images/icon-1024.icns
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5248b4d05504374f0a4aa64c76d9d7fec4beb36e09dc9780439cc44c9f94896c
+size 63769
diff --git a/images/icon-1024.png b/images/icon-1024.png
new file mode 100644
index 0000000..05b8a9a
--- /dev/null
+++ b/images/icon-1024.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a456fafd16b4b6c733dcb00dc7c09f51852f924bb7397da3fcd2019742f8f0f
+size 56482
diff --git a/images/icon-512.png b/images/icon-512.png
new file mode 100644
index 0000000..71ce9c7
--- /dev/null
+++ b/images/icon-512.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e461f9f0f415d8ff048c1e61db34413aaa2efe76699cb2c8a28054cfa90cf336
+size 24034
diff --git a/main.js b/main.js
index 0577550..2fe3084 100644
--- a/main.js
+++ b/main.js
@@ -26,7 +26,7 @@ function loadConfig() {
         config = JSON.parse(data);
     } catch (err) {
         if (err.code == 'ENOENT') {
-            console.warn('No config file found.');
+            console.warn('No config file found at ' + path.join(__dirname, "config.json"));
         } else {
             console.error(err);
         }
@@ -41,6 +41,7 @@ async function createWindow() {
         width: 1920,
         height: 1080,
         backgroundColor: '#000000',
+        icon: 'images/icon-512.png',
         webPreferences: {
             preload: path.join(__dirname, 'preload.js'),
             nodeIntegration: true,
@@ -54,7 +55,7 @@ async function createWindow() {
         win = null;
     });
 
-    win.webContents.addListener("will-navigate", validateDomain);
+    win.webContents.addListener("willnavigate-", validateDomain);
 
     win.once("ready-to-show", () => {
         win.setKiosk(true);
diff --git a/package-lock.json b/package-lock.json
index 0ed5815..e0c9c9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,8 @@
       "dependencies": {
         "electron-icon-builder": "^2.0.1",
         "electron-log": "^5.1.5",
-        "electron-squirrel-startup": "^1.0.1"
+        "electron-squirrel-startup": "^1.0.1",
+        "link-exists": "^1.2.2"
       },
       "devDependencies": {
         "@electron-forge/cli": "^7.4.0",
@@ -5742,6 +5743,11 @@
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
     },
+    "node_modules/http": {
+      "version": "0.0.1-security",
+      "resolved": "https://registry.npmjs.org/http/-/http-0.0.1-security.tgz",
+      "integrity": "sha512-RnDvP10Ty9FxqOtPZuxtebw1j4L/WiqNMDtuc1YMH1XQm5TgDRaR1G9u8upL6KD1bXHSp9eSXo/ED+8Q7FAr+g=="
+    },
     "node_modules/http-cache-semantics": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
@@ -6275,6 +6281,17 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/link-exists": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/link-exists/-/link-exists-1.2.2.tgz",
+      "integrity": "sha512-+XCx5L6sdebuhskxodjKpwAmX2L8esd4CNUQtw4Dn7Ztx4L30EPFhf9uH0Aw7JhYcRE8cNnZQkMcvKplhkkr+A==",
+      "dependencies": {
+        "http": "^0.0.1-security"
+      },
+      "engines": {
+        "node": ">= 16.0.0"
+      }
+    },
     "node_modules/listr2": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/listr2/-/listr2-7.0.2.tgz",
diff --git a/package.json b/package.json
index 037f758..29390bc 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,10 @@
   "dependencies": {
     "electron-icon-builder": "^2.0.1",
     "electron-log": "^5.1.5",
-    "electron-squirrel-startup": "^1.0.1"
+    "electron-squirrel-startup": "^1.0.1",
+    "link-exists": "^1.2.2"
   },
-  "name": "tooloop-kiosk-browser",
+  "name": "Tooloop Kiosk Browser",
   "version": "1.0.0",
   "main": "main.js",
   "scripts": {