diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.idea/.gitignore b/.idea/.gitignore old mode 100644 new mode 100755 diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml old mode 100644 new mode 100755 diff --git a/.idea/ed-safari.iml b/.idea/ed-safari.iml old mode 100644 new mode 100755 diff --git a/.idea/modules.xml b/.idea/modules.xml old mode 100644 new mode 100755 diff --git a/.idea/vcs.xml b/.idea/vcs.xml old mode 100644 new mode 100755 diff --git a/forge.config.js b/forge.config.js old mode 100644 new mode 100755 index 0440335..941f732 --- a/forge.config.js +++ b/forge.config.js @@ -4,7 +4,10 @@ module.exports = { makers: [ { name: '@electron-forge/maker-squirrel', - config: {}, + config: { + certificateFile: './cert.pfx', + certificatePassword: process.env.CERTIFICATE_PASSWORD, + }, }, { name: '@electron-forge/maker-zip', diff --git a/index.html b/index.html old mode 100644 new mode 100755 index d910d90..6620ae8 --- a/index.html +++ b/index.html @@ -3,8 +3,6 @@ ED Safari v0.0.1 - - diff --git a/journal examples.txt b/journal examples.txt old mode 100644 new mode 100755 diff --git a/package-lock.json b/package-lock.json old mode 100644 new mode 100755 index 6f445d8..bc90c5c --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "@electron-forge/maker-squirrel": "^6.1.1", "@electron-forge/maker-zip": "^6.1.1", "@electron-forge/plugin-vite": "^6.1.1", + "@tsconfig/node-lts": "^18.12.2", "@tsconfig/node20": "^1.0.0", "@types/lodash-es": "^4.17.7", "@types/node": "^20.1.2", @@ -1175,6 +1176,12 @@ "node": ">= 10" } }, + "node_modules/@tsconfig/node-lts": { + "version": "18.12.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node-lts/-/node-lts-18.12.2.tgz", + "integrity": "sha512-1zbWpsZkChnemJsRm+G2EyjuPueNPkjBEfp08ET1uCv0CUL/5AK1IZvFtEsw7ZyEqojIydye3mwt6k8isULj4A==", + "dev": true + }, "node_modules/@tsconfig/node20": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@tsconfig/node20/-/node20-1.0.0.tgz", diff --git a/package.json b/package.json old mode 100644 new mode 100755 index 1f93862..b693337 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "@electron-forge/maker-squirrel": "^6.1.1", "@electron-forge/maker-zip": "^6.1.1", "@electron-forge/plugin-vite": "^6.1.1", + "@tsconfig/node-lts": "^18.12.2", "@tsconfig/node20": "^1.0.0", "@types/lodash-es": "^4.17.7", "@types/node": "^20.1.2", diff --git a/src/@types/edsmResponses.d.ts b/src/@types/edsmResponses.d.ts old mode 100644 new mode 100755 diff --git a/src/@types/journalLines.d.ts b/src/@types/journalLines.d.ts old mode 100644 new mode 100755 diff --git a/src/assets/Eurostile-Roman.woff b/src/assets/Eurostile-Roman.woff old mode 100644 new mode 100755 diff --git a/src/assets/Eurostile-Roman.woff2 b/src/assets/Eurostile-Roman.woff2 old mode 100644 new mode 100755 diff --git a/src/assets/index.css b/src/assets/index.css old mode 100644 new mode 100755 diff --git a/src/assets/ldom.dev.js b/src/assets/ldom.dev.js old mode 100644 new mode 100755 diff --git a/src/assets/ldom.dev.js:Zone.Identifier b/src/assets/ldom.dev.js:Zone.Identifier old mode 100644 new mode 100755 diff --git a/src/data/BodyCodes.ts b/src/data/BodyCodes.ts old mode 100644 new mode 100755 diff --git a/src/icons/Flaticon.eot b/src/icons/Flaticon.eot old mode 100644 new mode 100755 diff --git a/src/icons/Flaticon.svg b/src/icons/Flaticon.svg old mode 100644 new mode 100755 diff --git a/src/icons/Flaticon.ttf b/src/icons/Flaticon.ttf old mode 100644 new mode 100755 diff --git a/src/icons/Flaticon.woff b/src/icons/Flaticon.woff old mode 100644 new mode 100755 diff --git a/src/icons/Flaticon.woff2 b/src/icons/Flaticon.woff2 old mode 100644 new mode 100755 diff --git a/src/icons/_flaticon.scss b/src/icons/_flaticon.scss old mode 100644 new mode 100755 diff --git a/src/icons/flaticon.css b/src/icons/flaticon.css old mode 100644 new mode 100755 diff --git a/src/icons/flaticon.html b/src/icons/flaticon.html old mode 100644 new mode 100755 diff --git a/src/main.js b/src/main.js old mode 100644 new mode 100755 diff --git a/src/models/Body.ts b/src/models/Body.ts old mode 100644 new mode 100755 diff --git a/src/models/EDSM.ts b/src/models/EDSM.ts old mode 100644 new mode 100755 diff --git a/src/models/Journal.ts b/src/models/Journal.ts old mode 100644 new mode 100755 index ee92f18..37f4de9 --- a/src/models/Journal.ts +++ b/src/models/Journal.ts @@ -15,6 +15,7 @@ import { Body } from "./Body" export class Journal extends EventEmitter { #path: string + testing: string location: System navRoute: System[] @@ -30,6 +31,8 @@ export class Journal extends EventEmitter { this.#getLastFsdJump() // -> IF no FSD Jump: this.#getLastLocation() // --> this.#getScannedBodies() + + this.testing = this.#path } /* --------------------------------------------------------------------- #getLastFsdJump ---- */ diff --git a/src/models/Log.ts b/src/models/Log.ts old mode 100644 new mode 100755 diff --git a/src/models/Safari.ts b/src/models/Safari.ts old mode 100644 new mode 100755 index da0e8aa..9567397 --- a/src/models/Safari.ts +++ b/src/models/Safari.ts @@ -15,10 +15,10 @@ export class Safari { journal?: Journal private constructor(isPackaged: boolean) { - if (!isPackaged) { // Account for WSL during development + if (!isPackaged && os.platform() === 'linux') { // Account for WSL during development this.#journalDir = "/mnt/c/Users/marle/Saved\ Games/Frontier\ Developments/Elite\ Dangerous/" } else if (os.platform() === 'win32') { // Windows - this.#journalDir = os.homedir() + '\\Saved Games\\Frontier Developments\\Elite Dangerous' + this.#journalDir = os.homedir() + '\\Saved Games\\Frontier Developments\\Elite Dangerous\\' } else if (os.platform() === 'linux') { // Linux this.#journalDir = os.homedir() + '/.local/share/Steam/steamapps/compatdata/359320/pfx/drive_c/users/steamuser/Saved Games/Frontier Developments/Elite Dangerous/' } else { @@ -43,7 +43,7 @@ export class Safari { // https://stackoverflow.com/questions/15696218/get-the-most-recent-file-in-a-directory-node-js #getLatestJournal(): Journal|undefined { - const journals = globSync(this.#journalPattern) + const journals = globSync(this.#journalPattern, {windowsPathsNoEscape: true}) const journalPath: string|undefined = _.maxBy(journals, file => fs.statSync(file).mtime) if (journalPath) { diff --git a/src/models/System.ts b/src/models/System.ts old mode 100644 new mode 100755 diff --git a/src/models/UI.js b/src/models/UI.js old mode 100644 new mode 100755 index ab3b33f..897c3db --- a/src/models/UI.js +++ b/src/models/UI.js @@ -21,7 +21,7 @@ export class UI { /* -------------------------------------------------------------------- setCurrentSystem ---- */ static setCurrentSystem(system) { - $('#acans').children().remove() + $('#scans').children().remove() $('#currentSystem').children().remove() let row diff --git a/src/preload.js b/src/preload.js old mode 100644 new mode 100755 diff --git a/src/renderer.js b/src/renderer.js old mode 100644 new mode 100755 index 5d72bf5..3c42709 --- a/src/renderer.js +++ b/src/renderer.js @@ -30,6 +30,8 @@ import 'bootstrap/dist/css/bootstrap.css' import './assets/index.css' import './icons/flaticon.css' +import './assets/ldom.dev' + const { app } = require('electron') import { Safari } from './models/Safari' import { UI } from './models/UI' diff --git a/tsconfig.json b/tsconfig.json old mode 100644 new mode 100755 index 6261f3c..358e1fe --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@tsconfig/node20/tsconfig.json", + "extends": "@tsconfig/node-lts/tsconfig.json", "compilerOptions": { "useUnknownInCatchVariables": false, "lib": ["DOM"] diff --git a/vite.main.config.mjs b/vite.main.config.mjs old mode 100644 new mode 100755 diff --git a/vite.preload.config.mjs b/vite.preload.config.mjs old mode 100644 new mode 100755 diff --git a/vite.renderer.config.mjs b/vite.renderer.config.mjs old mode 100644 new mode 100755