Skip to content

Altered file structure to update electron bulder #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
C4lopsitta wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

Altered file structure to update electron bulder #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d06963
Attempted removal of symlink of `gui-new` to allow for an upgrade of …
C4lopsitta Feb 13, 2026
33b0b94
Updated electron builder to 26.7.0
C4lopsitta Feb 13, 2026
79d662e
Upgraded GUI
C4lopsitta Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "elemento-gui-new"]
path = elemento-gui-new
path = ./electros-electron/elemento-gui-new
url = git@github.com:Elemento-Modular-Cloud/elemento-gui-new.git
6 changes: 3 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ FROM nginx:trixie
# entrypoint must run the electros app on port 80
COPY docker/nginx.conf /etc/nginx/nginx.conf
COPY electros-daemons/linux/x64/* /opt/daemons/
COPY elemento-gui-new/ /usr/share/nginx/html/
COPY elemento-gui-new/electros/configs/atomosFlags.json /usr/share/nginx/html/electros/configs/flags.json
COPY elemento-gui-new/electros/electrosOnAtomos.html /usr/share/nginx/html/electros/electros.html
COPY electros-electron/elemento-gui-new/ /usr/share/nginx/html/
COPY electros-electron/elemento-gui-new/electros/configs/atomosFlags.json /usr/share/nginx/html/electros/configs/flags.json
COPY electros-electron/elemento-gui-new/electros/electrosOnAtomos.html /usr/share/nginx/html/electros/electros.html
COPY docker/startup.sh /opt/app/startup.sh
COPY ./docker/follow_log.sh /opt/app/follow_log.sh
COPY ./docker/logger_stream.sh /opt/app/logger_stream.sh
Expand Down
6 changes: 3 additions & 3 deletions docker/arm_Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ FROM nginx:trixie
# entrypoint must run the electros app on port 80
COPY ./docker/nginx.conf /etc/nginx/nginx.conf
COPY electros-daemons/linux/arm64/* /opt/daemons/
COPY elemento-gui-new/ /usr/share/nginx/html/
COPY elemento-gui-new/electros/configs/atomosFlags.json /usr/share/nginx/html/electros/configs/flags.json
COPY elemento-gui-new/electros/electrosOnAtomos.html /usr/share/nginx/html/electros/electros.html
COPY electros-electron/elemento-gui-new/ /usr/share/nginx/html/
COPY electros-electron/elemento-gui-new/electros/configs/atomosFlags.json /usr/share/nginx/html/electros/configs/flags.json
COPY electros-electron/elemento-gui-new/electros/electrosOnAtomos.html /usr/share/nginx/html/electros/electros.html
COPY ./docker/arm_startup.sh /opt/app/startup.sh
COPY ./docker/follow_log.sh /opt/app/follow_log.sh
COPY ./docker/logger_stream.sh /opt/app/logger_stream.sh
Expand Down
4 changes: 2 additions & 2 deletions electros-electron/common/Loaders.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ export class Loaders {
try {
this.Css.Titlebar = fs.readFileSync(path.join(__dirname, 'titlebar', 'titlebar.css'), 'utf8');
const titlebarTempJs = fs.readFileSync(path.join(__dirname, 'titlebar', 'titlebar.js'), 'utf8');
this.Css.Themes = fs.readFileSync(path.join(__dirname, 'electros', 'css', 'themes.css'), 'utf8');
this.Css.FormControl = fs.readFileSync(path.join(__dirname, 'electros', 'css', 'form-controls.css'), 'utf8');
this.Css.Themes = fs.readFileSync(path.join(__dirname, 'elemento-gui-new', 'electros', 'css', 'themes.css'), 'utf8');
this.Css.FormControl = fs.readFileSync(path.join(__dirname, 'elemento-gui-new', 'electros', 'css', 'form-controls.css'), 'utf8');

this.Js.Themes = `
var theme = document.createElement('style');
Expand Down
6 changes: 3 additions & 3 deletions electros-electron/common/TrayIcon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ export class TrayIcon {
console.log(`The theme is light: ${isLight}`);

if (platform.isMac()) {
const templateIcon = path.join(__dirname, 'electros.iconset', 'tray_icon_black_32x32@2x.png');
const templateIcon = path.join(__dirname, 'elemento-gui-new', 'electros.iconset', 'tray_icon_black_32x32@2x.png');
const icon = nativeImage.createFromPath(templateIcon);
icon.setTemplateImage(true);
return icon;
}

if (platform.isWin()) {
const iconName = path.join(__dirname, 'electros.iconset', 'tray_icon.ico');
const iconName = path.join(__dirname, 'elemento-gui-new', 'electros.iconset', 'tray_icon.ico');
return nativeImage.createFromPath(iconName);
}

if (platform.isLinux()) {
const iconName = path.join(__dirname, 'electros.iconset', 'tray_icon.png');
const iconName = path.join(__dirname, 'elemento-gui-new', 'electros.iconset', 'tray_icon.png');
const icon = nativeImage.createFromPath(iconName);
return icon;
}
Expand Down
1 change: 0 additions & 1 deletion electros-electron/electros
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion electros-electron/electros.iconset
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions electros-electron/elemento-gui-new
Open in desktop
Submodule elemento-gui-new added at d40ef8
4 changes: 2 additions & 2 deletions electros-electron/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function createMainWindow() {
win.setWindowButtonVisibility(false);
}

win.loadFile('electros/electros.html');
win.loadFile('./elemento-gui-new/electros/electros.html');

// Inject custom titlebar after the page loads
win.webContents.on('did-finish-load', () => {
Expand Down Expand Up @@ -364,7 +364,7 @@ ipcMain.handle('open-ssh', async (event, connectionDetails) => {
const sshPath = path.join(
baseDir,
app.isPackaged ? 'app.asar.unpacked' : '',
'electros', 'remotes', 'ssh', 'ssh.cjs'
'elemento-gui-new', 'electros', 'remotes', 'ssh', 'ssh.cjs'
);

// Start the SSH server process
Expand Down
5 changes: 3 additions & 2 deletions electros-electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@
"target": [
"AppImage",
"deb",
"rpm"
"rpm",
"pacman"
],
"maintainer": "Elemento Cloud Srl <hello@elemento.cloud>",
"category": "Utility"
Expand Down Expand Up @@ -119,7 +120,7 @@
},
"devDependencies": {
"electron": "^40.1.0",
"electron-builder": "^25.1.8"
"electron-builder": "^26.7.0"
},
"overrides": {
"inflight": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion electros-electron/remotes/Ssh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class SshWindow {
const baseDir = app.isPackaged ? process.resourcesPath : this.__dirname;
const sshPath = path.join(
baseDir, app.isPackaged ? 'app.asar.unpacked' : '',
'electros', 'remotes', 'ssh', 'ssh.cjs'
'elemento-gui-new', 'electros', 'remotes', 'ssh', 'ssh.cjs'
);


Expand Down
2 changes: 1 addition & 1 deletion electros-electron/terminal/terminal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<link rel="stylesheet" href="../node_modules/@xterm/xterm/css/xterm.css" />
<link rel="stylesheet" href="../electros/css/style.css" />
<link rel="stylesheet" href="../elemento-gui-new/electros/css/style.css" />
<style>
* {
box-sizing: border-box;
Expand Down
4 changes: 2 additions & 2 deletions electros-electron/windows/Rdp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export class RdpWindow {
const mstscPath = path.join(
baseDir,
app.isPackaged ? 'app.asar.unpacked' : '',
'electros', 'remotes', 'rdp', 'mstsc-rs'
'elemento-gui-new', 'electros', 'remotes', 'rdp', 'mstsc-rs'
);

const spawnOptions = {
Expand Down Expand Up @@ -269,7 +269,7 @@ export class RdpWindow {
throw new Error("RDP Window not instantiated");
}
try {
await this._window.loadFile('electros/remotes/rdp/index.html', {
await this._window.loadFile('elemento-gui-new/electros/remotes/rdp/index.html', {
query: connectionDetails
});
} catch (error) {
Expand Down
1 change: 0 additions & 1 deletion elemento-gui-new
Open in desktop
Submodule elemento-gui-new deleted from 806be7