diff --git a/electron/main.js b/electron/main.js index 8974433..4b08378 100644 --- a/electron/main.js +++ b/electron/main.js @@ -4,19 +4,25 @@ const isDev = !app.isPackaged; let mainWindow; +// Handle Linux-specific sandbox issues +if (process.platform === 'linux') { + app.commandLine.appendSwitch('--no-sandbox'); + app.commandLine.appendSwitch('--disable-dev-shm-usage'); + app.commandLine.appendSwitch('--disable-gpu-sandbox'); +} + function createWindow() { mainWindow = new BrowserWindow({ - width: 1200, + width: 1400, height: 900, minWidth: 800, minHeight: 600, webPreferences: { nodeIntegration: false, contextIsolation: true, - enableRemoteModule: false, - webSecurity: true, - preload: path.join(__dirname, 'preload.js') + sandbox: false, + webSecurity: true }, icon: path.join(__dirname, '../public/logo.png'), title: 'istSOS4 Configurator', diff --git a/index.html b/index.html index e261f5b..f3f9087 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + istSOS4 Configurator diff --git a/package.json b/package.json index 814b9a4..c1b4f07 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "build": "vite build", "lint": "eslint .", "preview": "vite preview", - "electron": "electron .", - "electron-dev": "concurrently \"npm run dev\" \"wait-on http://localhost:5173 && electron .\"", + "electron": "electron . --no-sandbox --disable-gpu --disable-dev-shm-usage", + "electron-dev": "concurrently \"npm run dev\" \"wait-on http://localhost:5173 && electron . --no-sandbox --disable-gpu --disable-dev-shm-usage\"", "dist": "npm run build && electron-builder --publish=never", "dist:win": "npm run build && electron-builder --win --publish=never", "dist:mac": "npm run build && electron-builder --mac --publish=never", @@ -51,22 +51,36 @@ "files": [ "dist/**/*", "electron/**/*", - "public/logo.jpg" + "public/logo.png" ], "win": { "target": "nsis", - "icon": "public/logo.jpg", + "icon": "public/logo.png", "signAndEditExecutable": false }, "mac": { "target": "dmg", - "icon": "public/logo.jpg", + "icon": "public/logo.png", "category": "public.app-category.developer-tools" }, "linux": { - "target": "AppImage", - "icon": "public/logo.jpg", - "category": "Development" + "target": [ + { + "target": "AppImage", + "arch": [ + "x64" + ] + }, + { + "target": "deb", + "arch": [ + "x64" + ] + } + ], + "icon": "public/logo.png", + "category": "Development", + "executableName": "istsos4-configurator" }, "nsis": { "oneClick": false, @@ -81,3 +95,4 @@ "email": "info@istsos.org" } } + diff --git a/public/logo.jpg b/public/logo.jpg deleted file mode 100644 index 49be6eb..0000000 Binary files a/public/logo.jpg and /dev/null differ diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000..ae7f54c Binary files /dev/null and b/public/logo.png differ diff --git a/src/components/steps/CompletionStep.jsx b/src/components/steps/CompletionStep.jsx index 900fcb4..2d25632 100644 --- a/src/components/steps/CompletionStep.jsx +++ b/src/components/steps/CompletionStep.jsx @@ -89,15 +89,19 @@ function CompletionStep() {

Rahull004. "istSOS4 - Configuration Wizard" GitHub repository, 2025. Available: - - https://github.com/Rahull004/istSOS4-wizard - + Configuration Wizard" GitHub repository, 2025. +

+ {" "} + Available: + + https://github.com/Rahull004/istSOS4-wizard + +

Developed through{" "} diff --git a/src/components/steps/PerformanceStep.jsx b/src/components/steps/PerformanceStep.jsx index 8beb46a..7d136d2 100644 --- a/src/components/steps/PerformanceStep.jsx +++ b/src/components/steps/PerformanceStep.jsx @@ -26,7 +26,7 @@ function PerformanceStep() {

Configure performance optimization and advanced database settings

-
+
-
    -
  • • Default connection: redis://redis:6379
    • -
  • • Recommended memory: 512MB minimum
    • -
  • • Cache TTL: 1 hour (configurable)
    • -
+
)}
diff --git a/src/components/steps/ReviewStep.jsx b/src/components/steps/ReviewStep.jsx index 155b7ab..58106ab 100644 --- a/src/components/steps/ReviewStep.jsx +++ b/src/components/steps/ReviewStep.jsx @@ -64,7 +64,8 @@ FREQUENCY=${configuration.frequency} START_DATETIME=${ configuration.baseDatetime + "." + - "000"+ (configuration.timezoneOffset || "+01:00") + "000" + + (configuration.timezoneOffset || "+01:00") } PARTITION_CHUNK=${configuration.partitionChunk} CHUNK_INTERVAL=${configuration.chunkInterval} @@ -77,13 +78,8 @@ TOP_VALUE=${configuration.topValue} # Coordinate System EPSG=${configuration.epsg} - -# Docker Network Configuration (if using Redis) -${ - configuration.redis === 1 - ? "REDIS_HOST=redis\nREDIS_PORT=6379" - : "# Redis disabled" -}`; + +`; return env; }; @@ -342,6 +338,24 @@ ${

Download Configuration Files

+ + {/* Important Note */} +
+
+ * +
+

+ Important Note +

+

+ The downloaded file will be named istsos4.env. + Please rename it to .env after downloading, or + copy the content and paste it into your existing .env file. +

+
+
+
+
@@ -405,7 +419,7 @@ ${ docker-compose.yml {" "} - files with the newly generated files in your project. directory + files with the newly generated files in your project directory.
  • Ensure Docker and Docker Compose are installed on your system.