diff --git a/angular.json b/angular.json index fa5978d..bd29319 100644 --- a/angular.json +++ b/angular.json @@ -20,6 +20,7 @@ "tsConfig": "src/tsconfig.app.json", "assets": [ "src/assets", + "src/electron.js", "src/manifest.json" ], "styles": [ @@ -78,6 +79,7 @@ "scripts": [], "assets": [ "src/assets", + "src/electron.js", "src/manifest.json" ] } @@ -120,4 +122,4 @@ } }, "defaultProject": "fhsons" -} \ No newline at end of file +} diff --git a/package.json b/package.json index c1619dc..a875050 100644 --- a/package.json +++ b/package.json @@ -5,11 +5,10 @@ "scripts": { "ng": "ng", "start": "ng serve --host 0.0.0.0", - "build": "ng build --configuration=production", - "run-electron": "ng build --base-href=\"./\" && electron ./public/index.html", - "build-win": "electron-packager public/ FormulaManager --overwrite --asar --platform=win32 --arch=ia32 --icon=src/assets/icons/win/icon.ico --prune=true --out=src/assets/releases", - "build-mac": "electron-packager public/ FormulaManager --overwrite --asar --platform=darwin --arch=x64 --icon=src/assets/icons/mac/icon.icns --prune=true --out=src/assets/releases", - "build-linux": "electron-packager public/ FormulaManager --overwrite --asar --platform=linux --arch=x64 --icon=src/assets/icons/png/1024x1024.png --prune=true --out=src/assets/releases", + "build": "ng build --base-href=\"./\" --configuration=production", + "build-win": "electron-packager public/ FormulaManager --overwrite --asar --platform=win32 --arch=ia32 --icon=src/assets/icons/win/icon.ico --prune=true --out=src/assets/releases/", + "build-mac": "electron-packager public/ FormulaManager --overwrite --asar --platform=darwin --arch=x64 --icon=src/assets/icons/mac/icon.icns --prune=true --out=src/assets/releases/", + "build-linux": "electron-packager public/ FormulaManager --overwrite --asar --platform=linux --arch=x64 --icon=src/assets/icons/png/1024x1024.png --prune=true --out=src/assets/releases/", "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" diff --git a/src/assets/releases/FormulaManager-darwin-x64.zip b/src/assets/releases/FormulaManager-darwin-x64.zip index fab86af..a0baa9f 100644 Binary files a/src/assets/releases/FormulaManager-darwin-x64.zip and b/src/assets/releases/FormulaManager-darwin-x64.zip differ diff --git a/src/assets/releases/FormulaManager-linux-x64.zip b/src/assets/releases/FormulaManager-linux-x64.zip index 51fb950..443ce57 100644 Binary files a/src/assets/releases/FormulaManager-linux-x64.zip and b/src/assets/releases/FormulaManager-linux-x64.zip differ diff --git a/src/assets/releases/FormulaManager-win32-ia32.zip b/src/assets/releases/FormulaManager-win32-ia32.zip index d9497ad..a4a9743 100644 Binary files a/src/assets/releases/FormulaManager-win32-ia32.zip and b/src/assets/releases/FormulaManager-win32-ia32.zip differ diff --git a/electron.js b/src/electron.js similarity index 78% rename from electron.js rename to src/electron.js index 4f52655..d030b1d 100644 --- a/electron.js +++ b/src/electron.js @@ -14,13 +14,7 @@ function createWindow() { }); Menu.setApplicationMenu(null); - - // load the dist folder from Angular - win.loadURL('https://fhsons.zakscode.com/formulaManager'); - - // Open the DevTools optionally: - win.webContents.openDevTools(); - + win.loadFile('index.html'); win.on('closed', () => (win = null)); }