diff --git a/assets/icons/arrowdownicon.afdesign b/design_files/arrowdownicon.afdesign similarity index 100% rename from assets/icons/arrowdownicon.afdesign rename to design_files/arrowdownicon.afdesign diff --git a/assets/icons/arrowlefticon.afdesign b/design_files/arrowlefticon.afdesign similarity index 100% rename from assets/icons/arrowlefticon.afdesign rename to design_files/arrowlefticon.afdesign diff --git a/assets/icons/arrowrighticon.afdesign b/design_files/arrowrighticon.afdesign similarity index 100% rename from assets/icons/arrowrighticon.afdesign rename to design_files/arrowrighticon.afdesign diff --git a/assets/icons/arrowupicon.afdesign b/design_files/arrowupicon.afdesign similarity index 100% rename from assets/icons/arrowupicon.afdesign rename to design_files/arrowupicon.afdesign diff --git a/assets/icons/auditlogicon.afdesign b/design_files/auditlogicon.afdesign similarity index 100% rename from assets/icons/auditlogicon.afdesign rename to design_files/auditlogicon.afdesign diff --git a/assets/icons/bellicon.afdesign b/design_files/bellicon.afdesign similarity index 100% rename from assets/icons/bellicon.afdesign rename to design_files/bellicon.afdesign diff --git a/assets/icons/binicon.afdesign b/design_files/binicon.afdesign similarity index 100% rename from assets/icons/binicon.afdesign rename to design_files/binicon.afdesign diff --git a/assets/icons/checkcircleicon.afdesign b/design_files/checkcircleicon.afdesign similarity index 100% rename from assets/icons/checkcircleicon.afdesign rename to design_files/checkcircleicon.afdesign diff --git a/assets/icons/checkicon.afdesign b/design_files/checkicon.afdesign similarity index 100% rename from assets/icons/checkicon.afdesign rename to design_files/checkicon.afdesign diff --git a/assets/icons/cloudicon.afdesign b/design_files/cloudicon.afdesign similarity index 100% rename from assets/icons/cloudicon.afdesign rename to design_files/cloudicon.afdesign diff --git a/assets/icons/collapsesidebaricon.afdesign b/design_files/collapsesidebaricon.afdesign similarity index 100% rename from assets/icons/collapsesidebaricon.afdesign rename to design_files/collapsesidebaricon.afdesign diff --git a/assets/icons/contracticon.afdesign b/design_files/contracticon.afdesign similarity index 100% rename from assets/icons/contracticon.afdesign rename to design_files/contracticon.afdesign diff --git a/assets/icons/controlicon.afdesign b/design_files/controlicon.afdesign similarity index 100% rename from assets/icons/controlicon.afdesign rename to design_files/controlicon.afdesign diff --git a/assets/icons/copyicon.afdesign b/design_files/copyicon.afdesign similarity index 100% rename from assets/icons/copyicon.afdesign rename to design_files/copyicon.afdesign diff --git a/assets/icons/designicon.afdesign b/design_files/designicon.afdesign similarity index 100% rename from assets/icons/designicon.afdesign rename to design_files/designicon.afdesign diff --git a/assets/icons/developericon.afdesign b/design_files/developericon.afdesign similarity index 100% rename from assets/icons/developericon.afdesign rename to design_files/developericon.afdesign diff --git a/assets/icons/documenticon.afdesign b/design_files/documenticon.afdesign similarity index 100% rename from assets/icons/documenticon.afdesign rename to design_files/documenticon.afdesign diff --git a/assets/icons/documentprintericon.afdesign b/design_files/documentprintericon.afdesign similarity index 100% rename from assets/icons/documentprintericon.afdesign rename to design_files/documentprintericon.afdesign diff --git a/assets/icons/documentsizeicon.afdesign b/design_files/documentsizeicon.afdesign similarity index 100% rename from assets/icons/documentsizeicon.afdesign rename to design_files/documentsizeicon.afdesign diff --git a/assets/icons/documenttemplateicon.afdesign b/design_files/documenttemplateicon.afdesign similarity index 100% rename from assets/icons/documenttemplateicon.afdesign rename to design_files/documenttemplateicon.afdesign diff --git a/assets/icons/downloadicon.afdesign b/design_files/downloadicon.afdesign similarity index 100% rename from assets/icons/downloadicon.afdesign rename to design_files/downloadicon.afdesign diff --git a/assets/icons/editicon.afdesign b/design_files/editicon.afdesign similarity index 100% rename from assets/icons/editicon.afdesign rename to design_files/editicon.afdesign diff --git a/assets/icons/exclamationoctagonicon.afdesign b/design_files/exclamationoctagonicon.afdesign similarity index 100% rename from assets/icons/exclamationoctagonicon.afdesign rename to design_files/exclamationoctagonicon.afdesign diff --git a/assets/icons/expandicon.afdesign b/design_files/expandicon.afdesign similarity index 100% rename from assets/icons/expandicon.afdesign rename to design_files/expandicon.afdesign diff --git a/assets/icons/expandsidebaricon.afdesign b/design_files/expandsidebaricon.afdesign similarity index 100% rename from assets/icons/expandsidebaricon.afdesign rename to design_files/expandsidebaricon.afdesign diff --git a/assets/icons/eyeicon.afdesign b/design_files/eyeicon.afdesign similarity index 100% rename from assets/icons/eyeicon.afdesign rename to design_files/eyeicon.afdesign diff --git a/assets/icons/eyeslashicon.afdesign b/design_files/eyeslashicon.afdesign similarity index 100% rename from assets/icons/eyeslashicon.afdesign rename to design_files/eyeslashicon.afdesign diff --git a/assets/logos/farmcontroldevicon.afdesign b/design_files/farmcontroldevicon.afdesign similarity index 100% rename from assets/logos/farmcontroldevicon.afdesign rename to design_files/farmcontroldevicon.afdesign diff --git a/assets/logos/farmcontrolicon.afdesign b/design_files/farmcontrolicon.afdesign similarity index 100% rename from assets/logos/farmcontrolicon.afdesign rename to design_files/farmcontrolicon.afdesign diff --git a/assets/logos/farmcontroliconfill.afdesign b/design_files/farmcontroliconfill.afdesign similarity index 100% rename from assets/logos/farmcontroliconfill.afdesign rename to design_files/farmcontroliconfill.afdesign diff --git a/assets/logos/farmcontrollogosmall.afdesign b/design_files/farmcontrollogosmall.afdesign similarity index 100% rename from assets/logos/farmcontrollogosmall.afdesign rename to design_files/farmcontrollogosmall.afdesign diff --git a/assets/icons/filamenticon.afdesign b/design_files/filamenticon.afdesign similarity index 100% rename from assets/icons/filamenticon.afdesign rename to design_files/filamenticon.afdesign diff --git a/assets/icons/filamentstockicon.afdesign b/design_files/filamentstockicon.afdesign similarity index 100% rename from assets/icons/filamentstockicon.afdesign rename to design_files/filamentstockicon.afdesign diff --git a/assets/icons/gcodefileicon.afdesign b/design_files/gcodefileicon.afdesign similarity index 100% rename from assets/icons/gcodefileicon.afdesign rename to design_files/gcodefileicon.afdesign diff --git a/assets/icons/gridicon.afdesign b/design_files/gridicon.afdesign similarity index 100% rename from assets/icons/gridicon.afdesign rename to design_files/gridicon.afdesign diff --git a/assets/icons/homeicon.afdesign b/design_files/homeicon.afdesign similarity index 100% rename from assets/icons/homeicon.afdesign rename to design_files/homeicon.afdesign diff --git a/assets/icons/hosticon.afdesign b/design_files/hosticon.afdesign similarity index 100% rename from assets/icons/hosticon.afdesign rename to design_files/hosticon.afdesign diff --git a/assets/icons/infocircleicon.afdesign b/design_files/infocircleicon.afdesign similarity index 100% rename from assets/icons/infocircleicon.afdesign rename to design_files/infocircleicon.afdesign diff --git a/assets/icons/infoicon.afdesign b/design_files/infoicon.afdesign similarity index 100% rename from assets/icons/infoicon.afdesign rename to design_files/infoicon.afdesign diff --git a/assets/icons/inventoryicon.afdesign b/design_files/inventoryicon.afdesign similarity index 100% rename from assets/icons/inventoryicon.afdesign rename to design_files/inventoryicon.afdesign diff --git a/assets/icons/jobicon.afdesign b/design_files/jobicon.afdesign similarity index 100% rename from assets/icons/jobicon.afdesign rename to design_files/jobicon.afdesign diff --git a/assets/icons/levelbedicon.afdesign b/design_files/levelbedicon.afdesign similarity index 100% rename from assets/icons/levelbedicon.afdesign rename to design_files/levelbedicon.afdesign diff --git a/assets/icons/linkicon.afdesign b/design_files/linkicon.afdesign similarity index 100% rename from assets/icons/linkicon.afdesign rename to design_files/linkicon.afdesign diff --git a/assets/icons/listicon.afdesign b/design_files/listicon.afdesign similarity index 100% rename from assets/icons/listicon.afdesign rename to design_files/listicon.afdesign diff --git a/assets/icons/lockicon.afdesign b/design_files/lockicon.afdesign similarity index 100% rename from assets/icons/lockicon.afdesign rename to design_files/lockicon.afdesign diff --git a/assets/icons/materialicon.afdesign b/design_files/materialicon.afdesign similarity index 100% rename from assets/icons/materialicon.afdesign rename to design_files/materialicon.afdesign diff --git a/assets/icons/menuicon.afdesign b/design_files/menuicon.afdesign similarity index 100% rename from assets/icons/menuicon.afdesign rename to design_files/menuicon.afdesign diff --git a/assets/icons/minusicon.afdesign b/design_files/minusicon.afdesign similarity index 100% rename from assets/icons/minusicon.afdesign rename to design_files/minusicon.afdesign diff --git a/assets/icons/newmailicon.afdesign b/design_files/newmailicon.afdesign similarity index 100% rename from assets/icons/newmailicon.afdesign rename to design_files/newmailicon.afdesign diff --git a/assets/icons/newwindowicon.afdesign b/design_files/newwindowicon.afdesign similarity index 100% rename from assets/icons/newwindowicon.afdesign rename to design_files/newwindowicon.afdesign diff --git a/assets/icons/noteicon.afdesign b/design_files/noteicon.afdesign similarity index 100% rename from assets/icons/noteicon.afdesign rename to design_files/noteicon.afdesign diff --git a/assets/icons/notetypeicon.afdesign b/design_files/notetypeicon.afdesign similarity index 100% rename from assets/icons/notetypeicon.afdesign rename to design_files/notetypeicon.afdesign diff --git a/assets/icons/otpicon.afdesign b/design_files/otpicon.afdesign similarity index 100% rename from assets/icons/otpicon.afdesign rename to design_files/otpicon.afdesign diff --git a/assets/icons/particon.afdesign b/design_files/particon.afdesign similarity index 100% rename from assets/icons/particon.afdesign rename to design_files/particon.afdesign diff --git a/assets/icons/partstockicon.afdesign b/design_files/partstockicon.afdesign similarity index 100% rename from assets/icons/partstockicon.afdesign rename to design_files/partstockicon.afdesign diff --git a/assets/icons/passkeysicon.afdesign b/design_files/passkeysicon.afdesign similarity index 100% rename from assets/icons/passkeysicon.afdesign rename to design_files/passkeysicon.afdesign diff --git a/assets/icons/pausecircleicon.afdesign b/design_files/pausecircleicon.afdesign similarity index 100% rename from assets/icons/pausecircleicon.afdesign rename to design_files/pausecircleicon.afdesign diff --git a/assets/icons/pauseicon.afdesign b/design_files/pauseicon.afdesign similarity index 100% rename from assets/icons/pauseicon.afdesign rename to design_files/pauseicon.afdesign diff --git a/assets/icons/personicon.afdesign b/design_files/personicon.afdesign similarity index 100% rename from assets/icons/personicon.afdesign rename to design_files/personicon.afdesign diff --git a/assets/icons/playcircleicon.afdesign b/design_files/playcircleicon.afdesign similarity index 100% rename from assets/icons/playcircleicon.afdesign rename to design_files/playcircleicon.afdesign diff --git a/assets/icons/playicon.afdesign b/design_files/playicon.afdesign similarity index 100% rename from assets/icons/playicon.afdesign rename to design_files/playicon.afdesign diff --git a/assets/icons/plusicon.afdesign b/design_files/plusicon.afdesign similarity index 100% rename from assets/icons/plusicon.afdesign rename to design_files/plusicon.afdesign diff --git a/assets/icons/plusminusicon.afdesign b/design_files/plusminusicon.afdesign similarity index 100% rename from assets/icons/plusminusicon.afdesign rename to design_files/plusminusicon.afdesign diff --git a/assets/icons/printedparticon.afdesign b/design_files/printedparticon.afdesign similarity index 100% rename from assets/icons/printedparticon.afdesign rename to design_files/printedparticon.afdesign diff --git a/assets/icons/printericon.afdesign b/design_files/printericon.afdesign similarity index 100% rename from assets/icons/printericon.afdesign rename to design_files/printericon.afdesign diff --git a/assets/icons/producticon.afdesign b/design_files/producticon.afdesign similarity index 100% rename from assets/icons/producticon.afdesign rename to design_files/producticon.afdesign diff --git a/assets/icons/productionicon.afdesign b/design_files/productionicon.afdesign similarity index 100% rename from assets/icons/productionicon.afdesign rename to design_files/productionicon.afdesign diff --git a/assets/icons/productstockicon.afdesign b/design_files/productstockicon.afdesign similarity index 100% rename from assets/icons/productstockicon.afdesign rename to design_files/productstockicon.afdesign diff --git a/assets/icons/questioncircleicon.afdesign b/design_files/questioncircleicon.afdesign similarity index 100% rename from assets/icons/questioncircleicon.afdesign rename to design_files/questioncircleicon.afdesign diff --git a/assets/icons/reloadicon.afdesign b/design_files/reloadicon.afdesign similarity index 100% rename from assets/icons/reloadicon.afdesign rename to design_files/reloadicon.afdesign diff --git a/assets/icons/searchicon.afdesign b/design_files/searchicon.afdesign similarity index 100% rename from assets/icons/searchicon.afdesign rename to design_files/searchicon.afdesign diff --git a/assets/icons/settingsicon.afdesign b/design_files/settingsicon.afdesign similarity index 100% rename from assets/icons/settingsicon.afdesign rename to design_files/settingsicon.afdesign diff --git a/assets/icons/spoolicon.afdesign b/design_files/spoolicon.afdesign similarity index 100% rename from assets/icons/spoolicon.afdesign rename to design_files/spoolicon.afdesign diff --git a/assets/icons/stockauditicon.afdesign b/design_files/stockauditicon.afdesign similarity index 100% rename from assets/icons/stockauditicon.afdesign rename to design_files/stockauditicon.afdesign diff --git a/assets/icons/stockauditlevelicon.afdesign b/design_files/stockauditlevelicon.afdesign similarity index 100% rename from assets/icons/stockauditlevelicon.afdesign rename to design_files/stockauditlevelicon.afdesign diff --git a/assets/icons/stockeventicon.afdesign b/design_files/stockeventicon.afdesign similarity index 100% rename from assets/icons/stockeventicon.afdesign rename to design_files/stockeventicon.afdesign diff --git a/assets/icons/stopcircleicon.afdesign b/design_files/stopcircleicon.afdesign similarity index 100% rename from assets/icons/stopcircleicon.afdesign rename to design_files/stopcircleicon.afdesign diff --git a/assets/icons/subjobicon.afdesign b/design_files/subjobicon.afdesign similarity index 100% rename from assets/icons/subjobicon.afdesign rename to design_files/subjobicon.afdesign diff --git a/assets/icons/threedotsicon.afdesign b/design_files/threedotsicon.afdesign similarity index 100% rename from assets/icons/threedotsicon.afdesign rename to design_files/threedotsicon.afdesign diff --git a/assets/icons/unloadicon.afdesign b/design_files/unloadicon.afdesign similarity index 100% rename from assets/icons/unloadicon.afdesign rename to design_files/unloadicon.afdesign diff --git a/assets/icons/vendoricon.afdesign b/design_files/vendoricon.afdesign similarity index 100% rename from assets/icons/vendoricon.afdesign rename to design_files/vendoricon.afdesign diff --git a/assets/icons/xmarkcircleicon.afdesign b/design_files/xmarkcircleicon.afdesign similarity index 100% rename from assets/icons/xmarkcircleicon.afdesign rename to design_files/xmarkcircleicon.afdesign diff --git a/assets/icons/xmarkicon.afdesign b/design_files/xmarkicon.afdesign similarity index 100% rename from assets/icons/xmarkicon.afdesign rename to design_files/xmarkicon.afdesign diff --git a/package.json b/package.json index 727b974..63fa0e0 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "email": "tom@tombutcher.work" }, "version": "0.1.0", + "type": "module", "private": true, "homepage": "./", "dependencies": { @@ -69,10 +70,10 @@ "description": "3D Printer ERP and Control Software.", "scripts": { "dev": "vite", - "electron": "ELECTRON_START_URL=http://192.168.68.53:3000 electron .", + "electron": "ELECTRON_START_URL=http://0.0.0.0:3000 electron .", "start": "serve -s build", "build": "vite build", - "dev:electron": "concurrently \"react-scripts start\" \"ELECTRON_START_URL=http://192.168.68.53:3000 electron public/electron.js\"", + "dev:electron": "concurrently \"vite\" \"ELECTRON_START_URL=http://0.0.0.0:3000 electron public/electron.js\"", "build:electron": "npm run build && electron-builder" }, "eslintConfig": { @@ -117,9 +118,8 @@ }, "build": { "appId": "com.tombutcher.farmcontrol", - "icon": "src/assets/logos/farmcontrolicon.png", + "icon": "assets/logos/farmcontrolicon.png", "directories": { - "buildResources": "assets", "output": "app_dist" }, "files": [ diff --git a/public/electron.js b/public/electron.js index 5b6d659..dd4a432 100644 --- a/public/electron.js +++ b/public/electron.js @@ -1,5 +1,9 @@ -const { app, BrowserWindow, ipcMain, shell } = require('electron') -const path = require('path') +import { app, BrowserWindow, ipcMain, shell } from 'electron' +import path, { dirname } from 'path' +import { fileURLToPath } from 'url' + +const __filename = fileURLToPath(import.meta.url) +const __dirname = dirname(__filename) let win @@ -17,8 +21,8 @@ function createWindow() { }) // For development, load from localhost; for production, load the built index.html - if (import.meta.env.ELECTRON_START_URL) { - win.loadURL(import.meta.env.ELECTRON_START_URL) + if (process.env.ELECTRON_START_URL) { + win.loadURL(process.env.ELECTRON_START_URL) } else { win.loadFile(path.join(__dirname, '../build/index.html')) }