restructure src

lacymorrow · Oct 7, 2019 · 59501f8 · 59501f8
1 parent fb61010
commit 59501f8
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 7 deletions.
diff --git a/config.js b/config.js
@@ -4,7 +4,7 @@ const Store = require("electron-store");
 module.exports = new Store({
 	defaults: {
 		crosshair: 'leupold-dot',
-		color: '#FFFFFF',
+		color: '#00BCD4',
 		crosshair_index: 0,
 		opacity: 80,
 		position_x: -1,

diff --git a/index.js b/index.js
@@ -15,7 +15,7 @@ const unhandled = require("electron-unhandled");
 const debug = require("electron-debug");
 const contextMenu = require("electron-context-menu");
 const config = require("./config");
-const menu = require("./menu");
+const menu = require("./src/menu");
 
 unhandled();
 debug();
@@ -299,7 +299,7 @@ const createMainWindow = async () => {
 		mainWindow = undefined;
 	});
 
-	await win.loadFile(path.join(__dirname, "index.html"));
+	await win.loadFile(path.join(__dirname, "src/index.html"));
 
 	return win;
 };

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "crossover",
 	"productName": "CrossOver",
-	"version": "0.1.3",
+	"version": "0.1.5",
 	"description": "A Crosshair Overlay for any platform.",
 	"license": "MIT",
 	"repository": "lacymorrow/crossover",
@@ -14,7 +14,7 @@
 		"postinstall": "electron-builder install-app-deps",
 		"lint": "xo",
 		"test": "npm run lint",
-		"start": "sass index.scss:index.css -s compressed && electron .",
+		"start": "sass src/index.scss:src/index.css -s compressed && electron .",
 		"pack": "electron-builder --dir",
 		"dist": "rm -rf dist && electron-builder --macos --linux --windows",
 		"release": "np"

diff --git a/index.css → src/index.css b/index.css → src/index.css
diff --git a/index.css.map → src/index.css.map b/index.css.map → src/index.css.map
diff --git a/index.html → src/index.html b/index.html → src/index.html
@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<title>CrossOver</title>
-		<link rel="stylesheet" href="static/css/pickr.nano.min.css"/>
+		<link rel="stylesheet" href="vendor/pickr.nano.min.css"/>
 		<link rel="stylesheet" href="index.css">
 	</head>
 	<body>
@@ -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/index.scss → src/index.scss b/index.scss → src/index.scss
diff --git a/menu.js → src/menu.js b/menu.js → src/menu.js
diff --git a/renderer.js → src/renderer.js b/renderer.js → src/renderer.js
diff --git a/static/css/pickr.nano.min.css → src/vendor/pickr.nano.min.css b/static/css/pickr.nano.min.css → src/vendor/pickr.nano.min.css
diff --git a/static/crosshairs/ballistic-firedot.png b/static/crosshairs/ballistic-firedot.png
diff --git a/static/crosshairs/bullseye.png b/static/crosshairs/bullseye.png
diff --git a/static/crosshairs/leica-magnus.png b/static/crosshairs/leica-magnus.png
diff --git a/static/crosshairs/leupold-dot.png b/static/crosshairs/leupold-dot.png
diff --git a/static/crosshairs/starburst.png b/static/crosshairs/starburst.png
diff --git a/static/crosshairs/target-dot.png b/static/crosshairs/target-dot.png