Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 16 additions & 6 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ on:
type: boolean
default: true

env:
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true

jobs:
determine-version:
Expand Down Expand Up @@ -62,20 +60,26 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: "20"
node-version: "24"

- name: Install dependencies
run: pnpm install --frozen-lockfile

- name: Build with Turbo
run: pnpm turbo build --filter=testing-view
run: pnpm turbo build --filter=testing-view --filter=competition-view

- uses: actions/upload-artifact@v4
with:
name: frontend-dist
path: frontend/testing-view/dist/**
retention-days: 1

- uses: actions/upload-artifact@v4
with:
name: competition-dist
path: frontend/competition-view/dist/**
retention-days: 1

build-backend:
name: Build Backend - ${{ matrix.os }}
needs: determine-version
Expand Down Expand Up @@ -156,13 +160,19 @@ jobs:
name: frontend-dist
path: electron-app/renderer/testing-view

- name: Download competition-view dist
uses: actions/download-artifact@v4
with:
name: competition-dist
path: electron-app/renderer/competition-view

- uses: pnpm/action-setup@v4
with:
version: 10.26.0

- uses: actions/setup-node@v4
with:
node-version: "20"
node-version: "24"

- name: Update version in package.json
working-directory: electron-app
Expand All @@ -186,7 +196,7 @@ jobs:
run: |
find electron-app/dist -maxdepth 1 -type f \
\( -name "*.exe" -o -name "*.AppImage" -o -name "*.deb" \
-o -name "*.dmg" -o -name "*.zip" -o -name "*.yml" -o -name "*.blockmap" \) \
-o -name "*.rpm" -o -name "*.dmg" -o -name "*.zip" -o -name "*.yml" -o -name "*.blockmap" \) \
| xargs gh release upload v${{ needs.determine-version.outputs.version }} --clobber
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 2 additions & 0 deletions electron-app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ renderer
!renderer/
renderer/testing-view/
renderer/flashing-view/
renderer/competition-view/
# include mode-selector in the build output
!renderer/mode-selector/
!renderer/mode-selector/**
out
Expand Down
12 changes: 10 additions & 2 deletions electron-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,15 @@
"type": "module",
"author": {
"name": "Hyperloop UPV",
"email": "max766667@gmail.com"
"email": "partners@hyperloopupv.com"
},
"contributors": [
{ "name": "Maxim Grivennyy", "email": "max766667@gmail.com" },
{ "name": "Javier Ribal del Río", "email": "javierribaldelrio@gmail.com" },
{ "name": "Lola Castello" },
{ "name": "Alejandro González" },
{ "name": "Vasyl Klymenko" }
],
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -111,7 +118,8 @@
"linux": {
"target": [
"AppImage",
"deb"
"deb",
"rpm"
],
"icon": "icons/512x512.png",
"category": "Utility",
Expand Down
2 changes: 2 additions & 0 deletions electron-app/renderer/mode-selector/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ <h1>Control Station</h1>
</div>
<div class="button-grid">
<button id="testing" class="primary">Testing View</button>
<button id="competition" class="secondary">Competition View</button>
<button id="flashing" class="secondary">Flashing View</button>
</div>
<div class="aux-logo-wrap">
Expand All @@ -229,6 +230,7 @@ <h1>Control Station</h1>
}
};
document.getElementById('testing').addEventListener('click', () => sendMode('testing'));
document.getElementById('competition').addEventListener('click', () => sendMode('competition'));
document.getElementById('flashing').addEventListener('click', () => sendMode('flashing'));

const appVersionNode = document.getElementById('app-version');
Expand Down
7 changes: 4 additions & 3 deletions electron-app/src/app/modeSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { loadView } from "../windows/mainWindow.js";
const VALID_MODES = {
testing: "testing-view",
flashing: "flashing-view",
competition: "competition-view",
default: "testing-view",
};

Expand Down Expand Up @@ -79,7 +80,7 @@ async function showModeSelector(screenWidth, screenHeight) {
logger.electron.header("Main application window created");

// Start services and only then load the selected view.
if (view === "testing-view" || view === "flashing-view") {
if (view === "testing-view" || view === "flashing-view" || view === "competition-view") {
await startServices(screenWidth, screenHeight, view);
}

Expand Down Expand Up @@ -114,8 +115,8 @@ async function showModeSelector(screenWidth, screenHeight) {
* @returns {Promise<void>}
*/
async function startServices(screenWidth, screenHeight, view) {
// Start backend only for testing view
if (view === "testing-view") {
// Start backend for testing and competition views
if (view === "testing-view" || view === "competition-view") {
const logWindow = createLogWindow(screenWidth, screenHeight);
logWindow.show(); // Show the log window

Expand Down
4 changes: 3 additions & 1 deletion electron-app/src/app/updater.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ function setupUpdater() {
});

// Check for updates
autoUpdater.checkForUpdates();
autoUpdater.checkForUpdates().catch((error) => {
logger.electron.error("Update check failed:", error.message);
});
}

export { setupUpdater };
13 changes: 3 additions & 10 deletions electron-app/src/ipc/handlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@ import {
readConfig,
writeConfig,
} from "../config/configInstance.js";
import { getBackendWorkingDir, restartBackend } from "../processes/backend.js";
import { getBackendWorkingDir } from "../processes/backend.js";
import { logger } from "../utils/logger.js";
import {
getCurrentView,
getMainWindow,
loadView,
reloadWindow,
} from "../windows/mainWindow.js";

/**
Expand Down Expand Up @@ -68,10 +67,7 @@ function setupIpcHandlers() {
ipcMain.handle("save-config", async (event, config) => {
try {
await writeConfig(config);
await restartBackend();

reloadWindow();

app.emit("return-to-selector");
return true;
} catch (error) {
logger.electron.error("Error saving config:", error);
Expand Down Expand Up @@ -106,10 +102,7 @@ function setupIpcHandlers() {
ipcMain.handle("import-config", async () => {
try {
await importConfig();
await restartBackend();

reloadWindow();

app.emit("return-to-selector");
return true;
} catch (error) {
logger.electron.error("Error importing config:", error);
Expand Down
200 changes: 0 additions & 200 deletions shell.nix

This file was deleted.

Loading