restructure

lacymorrow · Oct 8, 2019 · 50d87fe · 50d87fe
1 parent 59501f8
commit 50d87fe
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 7 deletions.
diff --git a/index.js b/index.js
@@ -14,7 +14,7 @@ const { is } = require("electron-util");
 const unhandled = require("electron-unhandled");
 const debug = require("electron-debug");
 const contextMenu = require("electron-context-menu");
-const config = require("./config");
+const config = require("./src/config");
 const menu = require("./src/menu");
 
 unhandled();
@@ -49,7 +49,7 @@ app.setAppUserModelId("com.lacymorrow.CrossOver");
 let mainWindow;
 
 // __static path
-const __static = process.env.NODE_ENV !== 'development' ? path.join(__dirname, '/static').replace(/\\/g, '\\\\') : 'static'
+const __static = process.env.NODE_ENV !== 'development' ? path.join(__dirname, '/src/static').replace(/\\/g, '\\\\') : 'static'
 
 // Crosshair images
 const crosshairsPath = path.join(__static, 'crosshairs');
@@ -80,7 +80,7 @@ const setupCrosshairInput = () => {
 	const crosshair = config.get("crosshair");
 	new Promise((resolve, reject) => {
 		fs.readdir(crosshairsPath, (err, dir) => {
-			if (err) reject(err);
+			if (err) reject(`Promise Errored: ${err}`, crosshairsPath);
 
 			mainWindow.webContents.executeJavaScript(
 				`document.querySelector("#crosshairs").options.length = 0;`
@@ -101,9 +101,9 @@ const setupCrosshairInput = () => {
 				);
 			}
 
-			// mainWindow.webContents.executeJavaScript(
-			// 	`document.querySelector('#crosshairImg').src = 'static/crosshairs/${crosshair}.png'`
-			// );
+			mainWindow.webContents.executeJavaScript(
+				`document.querySelector('#crosshairImg').src = 'static/crosshairs/${crosshair}.png'`
+			);
 			mainWindow.webContents.executeJavaScript(
 				`
 					for(let i = 0; i < document.querySelector("#crosshairs").options.length; i++) {

diff --git a/config.js → src/config.js b/config.js → src/config.js
diff --git a/src/index.html b/src/index.html
@@ -12,7 +12,7 @@
 
 			<div class="crosshair-wrapper">
 				<div id="crosshair">
-					<img id="crosshairImg" src="../static/crosshairs/bullseye.png" draggable="false" />
+					<img id="crosshairImg" src="static/crosshairs/bullseye.png" draggable="false" />
 					<div class="sight dot">&nbsp;</div>
 				</div>
 				<div class="drag-me"></div>

diff --git a/static/Icon.png → src/static/Icon.png b/static/Icon.png → src/static/Icon.png
diff --git a/static/crosshairs/ballistic-firedot.png → src/static/crosshairs/ballistic-firedot.png b/static/crosshairs/ballistic-firedot.png → src/static/crosshairs/ballistic-firedot.png
diff --git a/static/crosshairs/bullseye.png → src/static/crosshairs/bullseye.png b/static/crosshairs/bullseye.png → src/static/crosshairs/bullseye.png
diff --git a/static/crosshairs/leica-magnus.png → src/static/crosshairs/leica-magnus.png b/static/crosshairs/leica-magnus.png → src/static/crosshairs/leica-magnus.png
diff --git a/static/crosshairs/leupold-dot.png → src/static/crosshairs/leupold-dot.png b/static/crosshairs/leupold-dot.png → src/static/crosshairs/leupold-dot.png
diff --git a/static/crosshairs/starburst.png → src/static/crosshairs/starburst.png b/static/crosshairs/starburst.png → src/static/crosshairs/starburst.png
diff --git a/static/crosshairs/target-dot.png → src/static/crosshairs/target-dot.png b/static/crosshairs/target-dot.png → src/static/crosshairs/target-dot.png