diff --git a/gui/electron-builder.yml b/gui/electron-builder.yml index f001efd12..a43c64443 100644 --- a/gui/electron-builder.yml +++ b/gui/electron-builder.yml @@ -31,9 +31,9 @@ linux: extraFiles: - from: "../server/desktop/build/libs/slimevr.jar" to: "." - - from: "./electron/ressources/69-slimevr-devices.rules" + - from: "./electron/resources/69-slimevr-devices.rules" to: "." - icon: "./electron/ressources/icons" + icon: "./electron/resources/icons" deb: depends: @@ -47,11 +47,11 @@ rpm: win: target: - target: portable - icon: "./electron/ressources/icons/icon.ico" + icon: "./electron/resources/icons/icon.ico" mac: target: dmg extraFiles: - from: "../server/desktop/build/libs/slimevr.jar" to: "." - icon: "./electron/ressources/icons/icon.icns" + icon: "./electron/resources/icons/icon.icns" diff --git a/gui/electron/.gitignore b/gui/electron/.gitignore index 9fe637a9d..e09ca8766 100644 --- a/gui/electron/.gitignore +++ b/gui/electron/.gitignore @@ -1 +1 @@ -ressources/java-version/JavaVersion.class +resources/java-version/JavaVersion.class diff --git a/gui/electron/main/index.ts b/gui/electron/main/index.ts index bd4c66a91..b72399df7 100644 --- a/gui/electron/main/index.ts +++ b/gui/electron/main/index.ts @@ -2,7 +2,6 @@ import { app, BrowserWindow, dialog, - ipcMain, Menu, nativeImage, net, @@ -14,8 +13,8 @@ import { import { IPC_CHANNELS } from '../shared'; import path, { dirname, join } from 'path'; import open from 'open'; -import trayIcon from '../ressources/icons/icon.png?asset'; -import appleTrayIcon from '../ressources/icons/appleTrayIcon.png?asset'; +import trayIcon from '../resources/icons/icon.png?asset'; +import appleTrayIcon from '../resources/icons/appleTrayIcon.png?asset'; import { readFile, stat } from 'fs/promises'; import { getPlatform, handleIpc, isPortAvailable } from './utils'; import { diff --git a/gui/electron/main/paths.ts b/gui/electron/main/paths.ts index 1b76c0dfa..9013c79e5 100644 --- a/gui/electron/main/paths.ts +++ b/gui/electron/main/paths.ts @@ -2,8 +2,8 @@ import { app } from 'electron'; import path, { join } from 'node:path'; import { getPlatform } from './utils'; import { glob } from 'glob'; -import { exec, spawn } from 'node:child_process'; -import javaVersionJar from '../ressources/java-version/JavaVersion.jar?asset&asarUnpack'; +import { spawn } from 'node:child_process'; +import javaVersionJar from '../resources/java-version/JavaVersion.jar?asset&asarUnpack'; import { existsSync } from 'node:fs'; import { options } from './cli' diff --git a/gui/electron/ressources/69-slimevr-devices.rules b/gui/electron/resources/69-slimevr-devices.rules similarity index 100% rename from gui/electron/ressources/69-slimevr-devices.rules rename to gui/electron/resources/69-slimevr-devices.rules diff --git a/gui/electron/ressources/icons/128x128.png b/gui/electron/resources/icons/128x128.png similarity index 100% rename from gui/electron/ressources/icons/128x128.png rename to gui/electron/resources/icons/128x128.png diff --git a/gui/electron/ressources/icons/128x128@2x.png b/gui/electron/resources/icons/128x128@2x.png similarity index 100% rename from gui/electron/ressources/icons/128x128@2x.png rename to gui/electron/resources/icons/128x128@2x.png diff --git a/gui/electron/ressources/icons/32x32.png b/gui/electron/resources/icons/32x32.png similarity index 100% rename from gui/electron/ressources/icons/32x32.png rename to gui/electron/resources/icons/32x32.png diff --git a/gui/electron/ressources/icons/Square107x107Logo.png b/gui/electron/resources/icons/Square107x107Logo.png similarity index 100% rename from gui/electron/ressources/icons/Square107x107Logo.png rename to gui/electron/resources/icons/Square107x107Logo.png diff --git a/gui/electron/ressources/icons/Square142x142Logo.png b/gui/electron/resources/icons/Square142x142Logo.png similarity index 100% rename from gui/electron/ressources/icons/Square142x142Logo.png rename to gui/electron/resources/icons/Square142x142Logo.png diff --git a/gui/electron/ressources/icons/Square150x150Logo.png b/gui/electron/resources/icons/Square150x150Logo.png similarity index 100% rename from gui/electron/ressources/icons/Square150x150Logo.png rename to gui/electron/resources/icons/Square150x150Logo.png diff --git a/gui/electron/ressources/icons/Square284x284Logo.png b/gui/electron/resources/icons/Square284x284Logo.png similarity index 100% rename from gui/electron/ressources/icons/Square284x284Logo.png rename to gui/electron/resources/icons/Square284x284Logo.png diff --git a/gui/electron/ressources/icons/Square30x30Logo.png b/gui/electron/resources/icons/Square30x30Logo.png similarity index 100% rename from gui/electron/ressources/icons/Square30x30Logo.png rename to gui/electron/resources/icons/Square30x30Logo.png diff --git a/gui/electron/ressources/icons/Square310x310Logo.png b/gui/electron/resources/icons/Square310x310Logo.png similarity index 100% rename from gui/electron/ressources/icons/Square310x310Logo.png rename to gui/electron/resources/icons/Square310x310Logo.png diff --git a/gui/electron/ressources/icons/Square44x44Logo.png b/gui/electron/resources/icons/Square44x44Logo.png similarity index 100% rename from gui/electron/ressources/icons/Square44x44Logo.png rename to gui/electron/resources/icons/Square44x44Logo.png diff --git a/gui/electron/ressources/icons/Square71x71Logo.png b/gui/electron/resources/icons/Square71x71Logo.png similarity index 100% rename from gui/electron/ressources/icons/Square71x71Logo.png rename to gui/electron/resources/icons/Square71x71Logo.png diff --git a/gui/electron/ressources/icons/Square89x89Logo.png b/gui/electron/resources/icons/Square89x89Logo.png similarity index 100% rename from gui/electron/ressources/icons/Square89x89Logo.png rename to gui/electron/resources/icons/Square89x89Logo.png diff --git a/gui/electron/ressources/icons/StoreLogo.png b/gui/electron/resources/icons/StoreLogo.png similarity index 100% rename from gui/electron/ressources/icons/StoreLogo.png rename to gui/electron/resources/icons/StoreLogo.png diff --git a/gui/electron/ressources/icons/android/mipmap-hdpi/ic_launcher.png b/gui/electron/resources/icons/android/mipmap-hdpi/ic_launcher.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-hdpi/ic_launcher.png rename to gui/electron/resources/icons/android/mipmap-hdpi/ic_launcher.png diff --git a/gui/electron/ressources/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/gui/electron/resources/icons/android/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-hdpi/ic_launcher_foreground.png rename to gui/electron/resources/icons/android/mipmap-hdpi/ic_launcher_foreground.png diff --git a/gui/electron/ressources/icons/android/mipmap-hdpi/ic_launcher_round.png b/gui/electron/resources/icons/android/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-hdpi/ic_launcher_round.png rename to gui/electron/resources/icons/android/mipmap-hdpi/ic_launcher_round.png diff --git a/gui/electron/ressources/icons/android/mipmap-mdpi/ic_launcher.png b/gui/electron/resources/icons/android/mipmap-mdpi/ic_launcher.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-mdpi/ic_launcher.png rename to gui/electron/resources/icons/android/mipmap-mdpi/ic_launcher.png diff --git a/gui/electron/ressources/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/gui/electron/resources/icons/android/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-mdpi/ic_launcher_foreground.png rename to gui/electron/resources/icons/android/mipmap-mdpi/ic_launcher_foreground.png diff --git a/gui/electron/ressources/icons/android/mipmap-mdpi/ic_launcher_round.png b/gui/electron/resources/icons/android/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-mdpi/ic_launcher_round.png rename to gui/electron/resources/icons/android/mipmap-mdpi/ic_launcher_round.png diff --git a/gui/electron/ressources/icons/android/mipmap-xhdpi/ic_launcher.png b/gui/electron/resources/icons/android/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-xhdpi/ic_launcher.png rename to gui/electron/resources/icons/android/mipmap-xhdpi/ic_launcher.png diff --git a/gui/electron/ressources/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/gui/electron/resources/icons/android/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-xhdpi/ic_launcher_foreground.png rename to gui/electron/resources/icons/android/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/gui/electron/ressources/icons/android/mipmap-xhdpi/ic_launcher_round.png b/gui/electron/resources/icons/android/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-xhdpi/ic_launcher_round.png rename to gui/electron/resources/icons/android/mipmap-xhdpi/ic_launcher_round.png diff --git a/gui/electron/ressources/icons/android/mipmap-xxhdpi/ic_launcher.png b/gui/electron/resources/icons/android/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-xxhdpi/ic_launcher.png rename to gui/electron/resources/icons/android/mipmap-xxhdpi/ic_launcher.png diff --git a/gui/electron/ressources/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/gui/electron/resources/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png rename to gui/electron/resources/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/gui/electron/ressources/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/gui/electron/resources/icons/android/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-xxhdpi/ic_launcher_round.png rename to gui/electron/resources/icons/android/mipmap-xxhdpi/ic_launcher_round.png diff --git a/gui/electron/ressources/icons/android/mipmap-xxxhdpi/ic_launcher.png b/gui/electron/resources/icons/android/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-xxxhdpi/ic_launcher.png rename to gui/electron/resources/icons/android/mipmap-xxxhdpi/ic_launcher.png diff --git a/gui/electron/ressources/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/gui/electron/resources/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png rename to gui/electron/resources/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/gui/electron/ressources/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/gui/electron/resources/icons/android/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from gui/electron/ressources/icons/android/mipmap-xxxhdpi/ic_launcher_round.png rename to gui/electron/resources/icons/android/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/gui/electron/ressources/icons/appleTrayIcon.png b/gui/electron/resources/icons/appleTrayIcon.png similarity index 100% rename from gui/electron/ressources/icons/appleTrayIcon.png rename to gui/electron/resources/icons/appleTrayIcon.png diff --git a/gui/electron/ressources/icons/icon.icns b/gui/electron/resources/icons/icon.icns similarity index 100% rename from gui/electron/ressources/icons/icon.icns rename to gui/electron/resources/icons/icon.icns diff --git a/gui/electron/ressources/icons/icon.ico b/gui/electron/resources/icons/icon.ico similarity index 100% rename from gui/electron/ressources/icons/icon.ico rename to gui/electron/resources/icons/icon.ico diff --git a/gui/electron/ressources/icons/icon.png b/gui/electron/resources/icons/icon.png similarity index 100% rename from gui/electron/ressources/icons/icon.png rename to gui/electron/resources/icons/icon.png diff --git a/gui/electron/ressources/icons/icon.svg b/gui/electron/resources/icons/icon.svg similarity index 100% rename from gui/electron/ressources/icons/icon.svg rename to gui/electron/resources/icons/icon.svg diff --git a/gui/electron/ressources/icons/ios/AppIcon-20x20@1x.png b/gui/electron/resources/icons/ios/AppIcon-20x20@1x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-20x20@1x.png rename to gui/electron/resources/icons/ios/AppIcon-20x20@1x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-20x20@2x-1.png b/gui/electron/resources/icons/ios/AppIcon-20x20@2x-1.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-20x20@2x-1.png rename to gui/electron/resources/icons/ios/AppIcon-20x20@2x-1.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-20x20@2x.png b/gui/electron/resources/icons/ios/AppIcon-20x20@2x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-20x20@2x.png rename to gui/electron/resources/icons/ios/AppIcon-20x20@2x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-20x20@3x.png b/gui/electron/resources/icons/ios/AppIcon-20x20@3x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-20x20@3x.png rename to gui/electron/resources/icons/ios/AppIcon-20x20@3x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-29x29@1x.png b/gui/electron/resources/icons/ios/AppIcon-29x29@1x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-29x29@1x.png rename to gui/electron/resources/icons/ios/AppIcon-29x29@1x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-29x29@2x-1.png b/gui/electron/resources/icons/ios/AppIcon-29x29@2x-1.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-29x29@2x-1.png rename to gui/electron/resources/icons/ios/AppIcon-29x29@2x-1.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-29x29@2x.png b/gui/electron/resources/icons/ios/AppIcon-29x29@2x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-29x29@2x.png rename to gui/electron/resources/icons/ios/AppIcon-29x29@2x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-29x29@3x.png b/gui/electron/resources/icons/ios/AppIcon-29x29@3x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-29x29@3x.png rename to gui/electron/resources/icons/ios/AppIcon-29x29@3x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-40x40@1x.png b/gui/electron/resources/icons/ios/AppIcon-40x40@1x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-40x40@1x.png rename to gui/electron/resources/icons/ios/AppIcon-40x40@1x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-40x40@2x-1.png b/gui/electron/resources/icons/ios/AppIcon-40x40@2x-1.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-40x40@2x-1.png rename to gui/electron/resources/icons/ios/AppIcon-40x40@2x-1.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-40x40@2x.png b/gui/electron/resources/icons/ios/AppIcon-40x40@2x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-40x40@2x.png rename to gui/electron/resources/icons/ios/AppIcon-40x40@2x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-40x40@3x.png b/gui/electron/resources/icons/ios/AppIcon-40x40@3x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-40x40@3x.png rename to gui/electron/resources/icons/ios/AppIcon-40x40@3x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-512@2x.png b/gui/electron/resources/icons/ios/AppIcon-512@2x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-512@2x.png rename to gui/electron/resources/icons/ios/AppIcon-512@2x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-60x60@2x.png b/gui/electron/resources/icons/ios/AppIcon-60x60@2x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-60x60@2x.png rename to gui/electron/resources/icons/ios/AppIcon-60x60@2x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-60x60@3x.png b/gui/electron/resources/icons/ios/AppIcon-60x60@3x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-60x60@3x.png rename to gui/electron/resources/icons/ios/AppIcon-60x60@3x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-76x76@1x.png b/gui/electron/resources/icons/ios/AppIcon-76x76@1x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-76x76@1x.png rename to gui/electron/resources/icons/ios/AppIcon-76x76@1x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-76x76@2x.png b/gui/electron/resources/icons/ios/AppIcon-76x76@2x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-76x76@2x.png rename to gui/electron/resources/icons/ios/AppIcon-76x76@2x.png diff --git a/gui/electron/ressources/icons/ios/AppIcon-83.5x83.5@2x.png b/gui/electron/resources/icons/ios/AppIcon-83.5x83.5@2x.png similarity index 100% rename from gui/electron/ressources/icons/ios/AppIcon-83.5x83.5@2x.png rename to gui/electron/resources/icons/ios/AppIcon-83.5x83.5@2x.png diff --git a/gui/electron/ressources/java-version/JavaVersion.jar b/gui/electron/resources/java-version/JavaVersion.jar similarity index 100% rename from gui/electron/ressources/java-version/JavaVersion.jar rename to gui/electron/resources/java-version/JavaVersion.jar diff --git a/gui/electron/ressources/java-version/JavaVersion.java b/gui/electron/resources/java-version/JavaVersion.java similarity index 100% rename from gui/electron/ressources/java-version/JavaVersion.java rename to gui/electron/resources/java-version/JavaVersion.java diff --git a/gui/package.json b/gui/package.json index 0732c7a4f..b79745e05 100644 --- a/gui/package.json +++ b/gui/package.json @@ -25,8 +25,8 @@ "lint": "tsc --noEmit && eslint --max-warnings=0 \"src/**/*.{js,jsx,ts,tsx,json}\" && prettier --check \"src/**/*.{js,jsx,ts,tsx,css,scss,md,json}\"", "lint:fix": "tsc --noEmit && eslint --fix --max-warnings=0 \"src/**/*.{js,jsx,ts,tsx,json}\" && pnpm run format", "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,css,scss,md,json}\"", - "javaversion-build": "cd electron/ressources/java-version/ && javac JavaVersion.java && jar cvfe JavaVersion.jar JavaVersion JavaVersion.class", - "gen:javaversion": "cd electron/ressources/java-version/ && javac JavaVersion.java && jar cvfe JavaVersion.jar JavaVersion JavaVersion.class", + "javaversion-build": "cd electron/resources/java-version/ && javac JavaVersion.java && jar cvfe JavaVersion.jar JavaVersion JavaVersion.class", + "gen:javaversion": "cd electron/resources/java-version/ && javac JavaVersion.java && jar cvfe JavaVersion.jar JavaVersion JavaVersion.class", "gen:firmware-tool": "openapi-codegen gen firmwareTool" }, "devDependencies": {