From 1b3f86333dc7f7ca3c714b3aff922c1d3c4895c0 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Thu, 20 Jun 2024 01:32:42 +0100
Subject: [PATCH 1/3] chore: move files

---
 package.json                              | 11 ++---------
 first-run.js => src/electron/first-run.js |  0
 index.html => src/electron/index.html     |  0
 main.js => src/electron/main.js           |  0
 tsconfig.json                             |  8 +-------
 5 files changed, 3 insertions(+), 16 deletions(-)
 rename first-run.js => src/electron/first-run.js (100%)
 rename index.html => src/electron/index.html (100%)
 rename main.js => src/electron/main.js (100%)

diff --git a/package.json b/package.json
index c78598ab8..fd4a66e71 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "gitify",
   "version": "5.9.0",
   "description": "GitHub Notifications on your menu bar.",
-  "main": "main.js",
+  "main": "src/electron/main.js",
   "scripts": {
     "build": "webpack --config webpack.prod.js",
     "clean": "rimraf build coverage node_modules",
@@ -64,14 +64,7 @@
   "build": {
     "appId": "com.electron.gitify",
     "productName": "Gitify",
-    "files": [
-      "build/**/*",
-      "assets/**/*",
-      "index.html",
-      "LICENSE",
-      "main.js",
-      "first-run.js"
-    ],
+    "files": ["build/**/*", "assets/**/*", "src/electron/*", "LICENSE"],
     "mac": {
       "category": "public.app-category.developer-tools",
       "icon": "assets/images/app-icon.icns",
diff --git a/first-run.js b/src/electron/first-run.js
similarity index 100%
rename from first-run.js
rename to src/electron/first-run.js
diff --git a/index.html b/src/electron/index.html
similarity index 100%
rename from index.html
rename to src/electron/index.html
diff --git a/main.js b/src/electron/main.js
similarity index 100%
rename from main.js
rename to src/electron/main.js
diff --git a/tsconfig.json b/tsconfig.json
index 99a01a632..d959bd763 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,11 +14,5 @@
     "types": ["jest"],
     "skipLibCheck": true
   },
-  "include": [
-    "src/**/*.js",
-    "src/**/*.ts",
-    "src/**/*.tsx",
-    "first-run.js",
-    "main.js"
-  ]
+  "include": ["src/**/*.js", "src/**/*.ts", "src/**/*.tsx"]
 }

From 7a1be7998322d10a112ff19b05e948e5231cd7dc Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Thu, 20 Jun 2024 01:54:17 +0100
Subject: [PATCH 2/3] chore: update paths

---
 src/electron/index.html | 18 +++++++++---------
 src/electron/main.js    | 10 ++--------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/electron/index.html b/src/electron/index.html
index 0d6c1a871..89b4b9064 100644
--- a/src/electron/index.html
+++ b/src/electron/index.html
@@ -15,7 +15,7 @@
     ></div>
   </body>
 
-  <script src="./build/js/app.js"></script>
+  <script src="./../../build/js/app.js"></script>
 
   <style>
     html,
@@ -27,34 +27,34 @@
 
     html::-webkit-scrollbar,
     div.flex-grow::-webkit-scrollbar {
-        width: 10px;
+      width: 10px;
     }
 
     html::-webkit-scrollbar-thumb,
     div.flex-grow::-webkit-scrollbar-thumb {
-        background-color: #c1c1c1;
-        border-radius: 10px;
+      background-color: #c1c1c1;
+      border-radius: 10px;
     }
 
     html::-webkit-scrollbar-thumb:hover,
     div.flex-grow::-webkit-scrollbar-thumb:hover {
-        background-color: #a8a8a8;
-        border-radius: 10px;
+      background-color: #a8a8a8;
+      border-radius: 10px;
     }
 
     html.dark::-webkit-scrollbar-track,
     html.dark div.flex-grow::-webkit-scrollbar-track {
-        background-color: #090E15;
+      background-color: #090e15;
     }
 
     html.dark::-webkit-scrollbar-thumb,
     html.dark div.flex-grow::-webkit-scrollbar-thumb {
-        background-color: #24292e;
+      background-color: #24292e;
     }
 
     html.dark::-webkit-scrollbar-thumb:hover,
     html.dark div.flex-grow::-webkit-scrollbar-thumb:hover {
-        background-color: #3a3f44;
+      background-color: #3a3f44;
     }
 
     body {
diff --git a/src/electron/main.js b/src/electron/main.js
index d1fc79aeb..6ac308aa5 100644
--- a/src/electron/main.js
+++ b/src/electron/main.js
@@ -8,18 +8,12 @@ const {
 const { menubar } = require('menubar');
 const { autoUpdater } = require('electron-updater');
 const { onFirstRunMaybe } = require('./first-run');
-const path = require('node:path');
 
 // TODO: Remove @electron/remote use - see #650
 require('@electron/remote/main').initialize();
 
-const idleIcon = path.join(
-  __dirname,
-  'assets',
-  'images',
-  'tray-idleTemplate.png',
-);
-const activeIcon = path.join(__dirname, 'assets', 'images', 'tray-active.png');
+const idleIcon = `${__dirname}/../../assets/images/tray-idleTemplate.png`;
+const activeIcon = `${__dirname}/../../assets/images/tray-active.png`;
 
 const browserWindowOpts = {
   width: 500,

From e1a1218e002d56dbc5fb5bec2b66065a8084cc83 Mon Sep 17 00:00:00 2001
From: Afonso Jorge Ramos <afonsojorgeramos@gmail.com>
Date: Thu, 20 Jun 2024 02:32:19 +0100
Subject: [PATCH 3/3] fix: use `path.resolve` for loading images

---
 src/electron/main.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/electron/main.js b/src/electron/main.js
index 6ac308aa5..303bd0e8c 100644
--- a/src/electron/main.js
+++ b/src/electron/main.js
@@ -8,12 +8,17 @@ const {
 const { menubar } = require('menubar');
 const { autoUpdater } = require('electron-updater');
 const { onFirstRunMaybe } = require('./first-run');
+const path = require('node:path');
 
 // TODO: Remove @electron/remote use - see #650
 require('@electron/remote/main').initialize();
 
-const idleIcon = `${__dirname}/../../assets/images/tray-idleTemplate.png`;
-const activeIcon = `${__dirname}/../../assets/images/tray-active.png`;
+const idleIcon = path.resolve(
+  `${__dirname}/../../assets/images/tray-idleTemplate.png`,
+);
+const activeIcon = path.resolve(
+  `${__dirname}/../../assets/images/tray-active.png`,
+);
 
 const browserWindowOpts = {
   width: 500,