diff --git a/client/@types/olympus/index.d.ts b/client/@types/olympus/index.d.ts index fc420406..c37bdcae 100644 --- a/client/@types/olympus/index.d.ts +++ b/client/@types/olympus/index.d.ts @@ -416,10 +416,6 @@ declare module "interfaces" { global { function getOlympusPlugin(): OlympusPlugin; } - export interface ConfigurationOptions { - port: number; - address: string; - } export interface ContextMenuOption { tooltip: string; src: string; @@ -787,6 +783,14 @@ declare module "other/utils" { export function generateUUIDv4(): string; export function keyEventWasInInput(event: KeyboardEvent): boolean; export function reciprocalHeading(heading: number): number; + /** + * Prepend numbers to the start of a string + * + * @param num subject number + * @param places places to pad + * @param decimal whether this is a decimal number or not + * + * */ export const zeroAppend: (num: number, places: number, decimal?: boolean) => string; export const zeroPad: (num: number, places: number) => string; export function similarity(s1: string, s2: string): number; @@ -2421,12 +2425,11 @@ declare module "server/servermanager" { export class ServerManager { #private; constructor(); - toggleDemoEnabled(): void; setCredentials(newUsername: string, newPassword: string): void; GET(callback: CallableFunction, uri: string, options?: ServerRequestOptions, responseType?: string, force?: boolean): void; PUT(request: object, callback: CallableFunction): void; getConfig(callback: CallableFunction): void; - setAddress(address: string, port: number): void; + setAddress(address: string): void; getAirbases(callback: CallableFunction): void; getBullseye(callback: CallableFunction): void; getLogs(callback: CallableFunction, refresh?: boolean): void; diff --git a/manager/build/manager/index.html b/manager/build/manager/index.html deleted file mode 100644 index 96ed27cb..00000000 --- a/manager/build/manager/index.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - DCS Olympus Manager {{OLYMPUS_VERSION_NUMBER}} - - - -
-
DCS Olympus manager
- - - - -
- -
- Loading, please wait... -
-
- - - - - - \ No newline at end of file diff --git a/manager/build/manager/main.js b/manager/build/manager/main.js deleted file mode 100644 index 2f831c79..00000000 --- a/manager/build/manager/main.js +++ /dev/null @@ -1,69 +0,0 @@ -const electronApp = require('electron').app; -const electronBrowserWindow = require('electron').BrowserWindow; -const electronIpcMain = require('electron').ipcMain; -const path = require('path'); - -let window; - -/* Add the System32 folder to the environment for the shortcuts creation to work properly */ -process.env['PATH'] = process.env['PATH'] + "%WINDIR%\\System32;" - -function createWindow() { - const window = new electronBrowserWindow({ - width: 1500, - height: 850, - frame: false, - resizable: true, - maximizable: true, - webPreferences: { - contextIsolation: true, - preload: path.join(__dirname, "javascripts", 'preload.js'), - nodeIntegration: true, - }, - icon: "./../img/olympus_configurator.ico" - }); - - window.loadFile('index.html').then(() => { window.show(); }); - - window.on("maximize", () => { - window.webContents.send('event:maximized') - }) - - window.on("unmaximize", () => { - window.webContents.send('event:unmaximized') - }) - - return window; -} - -electronApp.on('ready', () => { - window = createWindow(); -}); - -electronApp.on('window-all-closed', () => { - if (process.platform !== 'darwin') { - electronApp.quit(); - } -}); - -electronApp.on('activate', () => { - if (electronBrowserWindow.getAllWindows().length === 0) { - createWindow(); - } -}); - -electronIpcMain.on('window:minimize', () => { - window.minimize(); -}) - -electronIpcMain.on('window:maximize', () => { - window.maximize(); -}) - -electronIpcMain.on('window:restore', () => { - window.restore(); -}) - -electronIpcMain.on('window:close', () => { - window.close(); -}) diff --git a/manager/build/manager/manager.vbs b/manager/build/manager/manager.vbs deleted file mode 100644 index 36edd4cf..00000000 --- a/manager/build/manager/manager.vbs +++ /dev/null @@ -1 +0,0 @@ -CreateObject("Wscript.Shell").Run "npm start", 0 \ No newline at end of file diff --git a/manager/build/manager/package.json b/manager/build/manager/package.json deleted file mode 100644 index 0cbc415b..00000000 --- a/manager/build/manager/package.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "dcsolympus_manager", - "version": "1.0.0", - "description": "", - "main": "main.js", - "scripts": { - "start": "electron .", - "build-release": "call ./scripts/build-release.bat" - }, - "author": "", - "license": "ISC", - "dependencies": { - "adm-zip": "^0.5.10", - "create-desktop-shortcuts": "^1.10.1", - "dir-compare": "^4.2.0", - "ejs": "^3.1.9", - "electron": "^28.0.0", - "find-process": "^1.4.7", - "follow-redirects": "^1.15.4", - "octokit": "^3.1.2", - "portfinder": "^1.0.32", - "regedit": "^5.1.2", - "sha256": "^0.2.0", - "win-version-info": "^6.0.1" - } -} diff --git a/manager/scripts/build-release.bat b/manager/scripts/build-release.bat index b0ab9a24..10adb44e 100644 --- a/manager/scripts/build-release.bat +++ b/manager/scripts/build-release.bat @@ -3,4 +3,4 @@ echo D|xcopy /Y /S /E .\ejs ..\build\manager\ejs echo D|xcopy /Y /S /E .\javascripts ..\build\manager\javascripts echo D|xcopy /Y /S /E .\stylesheets ..\build\manager\stylesheets -echo F|xcopy /Y /I .\*.* .\build\manager \ No newline at end of file +echo F|xcopy /Y /I .\*.* ..\build\manager \ No newline at end of file diff --git a/scripts/batch/package.bat b/scripts/batch/package.bat index f392705a..c54a3516 100644 --- a/scripts/batch/package.bat +++ b/scripts/batch/package.bat @@ -12,7 +12,7 @@ REM copy the hooks script echo F|xcopy /Y .\scripts\lua\hooks\OlympusHook.lua .\package\Scripts\OlympusHook.lua REM copy the lua scripts -echo F|xcopy /Y .\scripts\lua\backend .\package\mod\scripts +echo D|xcopy /Y /S /E .\scripts\lua\backend .\package\mod\scripts REM copy the mod folder echo D|xcopy /Y /S /E .\mod .\package\mod