diff --git a/app.dev.js b/app/app.dev.js similarity index 100% rename from app.dev.js rename to app/app.dev.js diff --git a/app.js b/app/app.js similarity index 96% rename from app.js rename to app/app.js index c00b8bb6..ed3efe86 100644 --- a/app.js +++ b/app/app.js @@ -15,7 +15,7 @@ const app = electron.app const BrowserWindow = electron.BrowserWindow // Set the window content -let url = `file://${path.join(__dirname, '/dist/index.html')}` +let url = `file://${path.join(__dirname, '../dist/index.html')}` let mainWindow // Set the application menu diff --git a/icons/icon_base.png b/app/icons/icon_base.png similarity index 100% rename from icons/icon_base.png rename to app/icons/icon_base.png diff --git a/icons/mac/icon.icns b/app/icons/mac/icon.icns similarity index 100% rename from icons/mac/icon.icns rename to app/icons/mac/icon.icns diff --git a/icons/png/1024x1024.png b/app/icons/png/1024x1024.png similarity index 100% rename from icons/png/1024x1024.png rename to app/icons/png/1024x1024.png diff --git a/icons/png/128x128.png b/app/icons/png/128x128.png similarity index 100% rename from icons/png/128x128.png rename to app/icons/png/128x128.png diff --git a/icons/png/16x16.png b/app/icons/png/16x16.png similarity index 100% rename from icons/png/16x16.png rename to app/icons/png/16x16.png diff --git a/icons/png/24x24.png b/app/icons/png/24x24.png similarity index 100% rename from icons/png/24x24.png rename to app/icons/png/24x24.png diff --git a/icons/png/256x256.png b/app/icons/png/256x256.png similarity index 100% rename from icons/png/256x256.png rename to app/icons/png/256x256.png diff --git a/icons/png/32x32.png b/app/icons/png/32x32.png similarity index 100% rename from icons/png/32x32.png rename to app/icons/png/32x32.png diff --git a/icons/png/48x48.png b/app/icons/png/48x48.png similarity index 100% rename from icons/png/48x48.png rename to app/icons/png/48x48.png diff --git a/icons/png/512x512.png b/app/icons/png/512x512.png similarity index 100% rename from icons/png/512x512.png rename to app/icons/png/512x512.png diff --git a/icons/png/64x64.png b/app/icons/png/64x64.png similarity index 100% rename from icons/png/64x64.png rename to app/icons/png/64x64.png diff --git a/icons/win/icon.ico b/app/icons/win/icon.ico similarity index 100% rename from icons/win/icon.ico rename to app/icons/win/icon.ico diff --git a/installers/appx/assets/SampleAppx.150x150.png b/app/installers/appx/assets/SampleAppx.150x150.png similarity index 100% rename from installers/appx/assets/SampleAppx.150x150.png rename to app/installers/appx/assets/SampleAppx.150x150.png diff --git a/installers/appx/assets/SampleAppx.310x150.png b/app/installers/appx/assets/SampleAppx.310x150.png similarity index 100% rename from installers/appx/assets/SampleAppx.310x150.png rename to app/installers/appx/assets/SampleAppx.310x150.png diff --git a/installers/appx/assets/SampleAppx.44x44.png b/app/installers/appx/assets/SampleAppx.44x44.png similarity index 100% rename from installers/appx/assets/SampleAppx.44x44.png rename to app/installers/appx/assets/SampleAppx.44x44.png diff --git a/installers/appx/assets/SampleAppx.44x44.targetsize-256.png b/app/installers/appx/assets/SampleAppx.44x44.targetsize-256.png similarity index 100% rename from installers/appx/assets/SampleAppx.44x44.targetsize-256.png rename to app/installers/appx/assets/SampleAppx.44x44.targetsize-256.png diff --git a/installers/appx/assets/SampleAppx.44x44.targetsize-256_altform-unplated.png b/app/installers/appx/assets/SampleAppx.44x44.targetsize-256_altform-unplated.png similarity index 100% rename from installers/appx/assets/SampleAppx.44x44.targetsize-256_altform-unplated.png rename to app/installers/appx/assets/SampleAppx.44x44.targetsize-256_altform-unplated.png diff --git a/installers/appx/assets/SampleAppx.44x44.targetsize-44.png b/app/installers/appx/assets/SampleAppx.44x44.targetsize-44.png similarity index 100% rename from installers/appx/assets/SampleAppx.44x44.targetsize-44.png rename to app/installers/appx/assets/SampleAppx.44x44.targetsize-44.png diff --git a/installers/appx/assets/SampleAppx.44x44.targetsize-44_altform-unplated.png b/app/installers/appx/assets/SampleAppx.44x44.targetsize-44_altform-unplated.png similarity index 100% rename from installers/appx/assets/SampleAppx.44x44.targetsize-44_altform-unplated.png rename to app/installers/appx/assets/SampleAppx.44x44.targetsize-44_altform-unplated.png diff --git a/installers/appx/assets/SampleAppx.44x44.targetsize-48.png b/app/installers/appx/assets/SampleAppx.44x44.targetsize-48.png similarity index 100% rename from installers/appx/assets/SampleAppx.44x44.targetsize-48.png rename to app/installers/appx/assets/SampleAppx.44x44.targetsize-48.png diff --git a/installers/appx/assets/SampleAppx.44x44.targetsize-48_altform-unplated.png b/app/installers/appx/assets/SampleAppx.44x44.targetsize-48_altform-unplated.png similarity index 100% rename from installers/appx/assets/SampleAppx.44x44.targetsize-48_altform-unplated.png rename to app/installers/appx/assets/SampleAppx.44x44.targetsize-48_altform-unplated.png diff --git a/installers/appx/assets/SampleAppx.50x50.png b/app/installers/appx/assets/SampleAppx.50x50.png similarity index 100% rename from installers/appx/assets/SampleAppx.50x50.png rename to app/installers/appx/assets/SampleAppx.50x50.png diff --git a/installers/create-appx.js b/app/installers/create-appx.js similarity index 100% rename from installers/create-appx.js rename to app/installers/create-appx.js diff --git a/installers/create-deb-arm.js b/app/installers/create-deb-arm.js similarity index 100% rename from installers/create-deb-arm.js rename to app/installers/create-deb-arm.js diff --git a/installers/create-deb-x64.js b/app/installers/create-deb-x64.js similarity index 100% rename from installers/create-deb-x64.js rename to app/installers/create-deb-x64.js diff --git a/installers/create-dmg.js b/app/installers/create-dmg.js similarity index 100% rename from installers/create-dmg.js rename to app/installers/create-dmg.js diff --git a/installers/create-exe.js b/app/installers/create-exe.js similarity index 100% rename from installers/create-exe.js rename to app/installers/create-exe.js diff --git a/installers/make.ps1 b/app/installers/make.ps1 similarity index 100% rename from installers/make.ps1 rename to app/installers/make.ps1 diff --git a/menu.js b/app/menu.js similarity index 97% rename from menu.js rename to app/menu.js index 0215cb99..21d77b05 100644 --- a/menu.js +++ b/app/menu.js @@ -41,10 +41,10 @@ const template = [ label: 'About', click () { openAboutWindow({ + package_json_dir: path.join(__dirname, '..'), icon_path: path.join(__dirname, '/icons/png/512x512.png'), bug_report_url: "https://gitlab.com/openflexure/openflexure-microscope-jsclient/issues", homepage: "https://gitlab.com/openflexure/openflexure-microscope-jsclient", - package_json_dir: __dirname }) } } diff --git a/setupEvents.js b/app/setupEvents.js similarity index 100% rename from setupEvents.js rename to app/setupEvents.js diff --git a/package.json b/package.json index 7be92330..f100c479 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,11 @@ "private": true, "description": "An electron-based user client for the OpenFlexure Microscope Server", "author": "OpenFlexure", + "productName": "OpenFlexure eV", + "publisher": "Bath Open Instrumentation Group", + "displayName": "OpenFlexure eV", + "license": "GNU General Public License v3.0 ", + "main": "app/app.js", "scripts": { "build:android": "npm run setup-webpack-config && tns build android --bundle --env.production && npm run remove-webpack-config", "build:ios": "npm run setup-webpack-config && tns build ios --bundle --env.production && npm run remove-webpack-config", @@ -16,10 +21,10 @@ "electron:run": "electron .", "electron:dev": "electron app.dev.js", "package:all": "npm run build:web && npm run package:win && npm run package:linux && npm run package:rpi && npm run package:darwin", - "package:darwin": "electron-packager . openflexure-ev --ignore=\"^/(src|installers|platforms|hooks|\\..*)\" --overwrite --asar --platform=darwin --arch=x64 --icon=icons/mac/icon.icns --prune=true --out=release-builds", - "package:linux": "electron-packager . openflexure-ev --ignore=\"^/(src|installers|platforms|hooks|\\..*)\" --overwrite --asar --platform=linux --arch=x64 --icon=icons/png/1024x1024.png --prune=true --out=release-builds", - "package:rpi": "electron-packager . openflexure-ev --ignore=\"^/(src|installers|platforms|hooks|\\..*)\" --overwrite --asar --platform=linux --electron-version=3.0.13 --arch=armv7l --icon=icons/png/1024x1024.png --prune=true --out=release-builds", - "package:win": "electron-packager . openflexure-ev --ignore=\"^/(src|installers|platforms|hooks|\\..*)\" --overwrite --asar --platform=win32 --arch=x64 --icon=icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"OpenFlexure Microscope JS\"", + "package:darwin": "electron-packager . openflexure-ev --ignore=\"^/(src|app/installers|platforms|hooks|\\..*)\" --overwrite --asar --platform=darwin --arch=x64 --icon=app/icons/mac/icon.icns --prune=true --out=release-builds", + "package:linux": "electron-packager . openflexure-ev --ignore=\"^/(src|app/installers|platforms|hooks|\\..*)\" --overwrite --asar --platform=linux --arch=x64 --icon=app/icons/png/1024x1024.png --prune=true --out=release-builds", + "package:rpi": "electron-packager . openflexure-ev --ignore=\"^/(src|app/installers|platforms|hooks|\\..*)\" --overwrite --asar --platform=linux --electron-version=3.0.13 --arch=armv7l --icon=app/icons/png/1024x1024.png --prune=true --out=release-builds", + "package:win": "electron-packager . openflexure-ev --ignore=\"^/(src|app/installers|platforms|hooks|\\..*)\" --overwrite --platform=win32 --arch=x64 --icon=app/icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"OpenFlexure Microscope JS\"", "preview:android": "npm run setup-webpack-config && tns preview --bundle --env.development --env.android", "preview:ios": "npm run setup-webpack-config && tns preview --bundle --env.development --env.ios", "remove-webpack-config": "node ./node_modules/vue-cli-plugin-nativescript-vue/lib/scripts/webpack-maintenance post", @@ -42,8 +47,12 @@ "babel-loader": "^8.0.5", "css-loader": "^2.1.0", "electron": "^4.1.4", + "electron-builder": "^20.39.0", "electron-installer-common": "^0.6.1", + "electron-installer-debian": "^1.1.1", "electron-packager": "^13.1.1", + "electron-windows-store": "^2.1.0", + "electron-winstaller": "^2.7.0", "less": "^3.9.0", "less-loader": "^4.1.0", "nativescript-dev-webpack": "^0.20.3", @@ -60,13 +69,9 @@ "vue-template-compiler": "^2.5.21", "vuex": "^3.0.1", "webpack": "^4.29.6", - "webpack-cli": "^3.3.0", - "electron-winstaller": "^2.7.0", - "electron-installer-debian": "^1.1.1", - "electron-windows-store": "^2.1.0" - }, - "optionalDependencies": { + "webpack-cli": "^3.3.0" }, + "optionalDependencies": {}, "postcss": { "plugins": { "autoprefixer": {} @@ -77,9 +82,6 @@ "last 2 versions", "not ie <= 8" ], - "displayName": "OpenFlexure eV", - "license": "GNU General Public License v3.0 ", - "main": "app.js", "nativescript": { "id": "org.nativescript.application", "tns-ios": { @@ -88,7 +90,5 @@ "tns-android": { "version": "5.2.1" } - }, - "productName": "OpenFlexure eV", - "publisher": "Bath Open Instrumentation Group" + } }