From b22c26cae614d4750ffbf6de4800cb292b10dc98 Mon Sep 17 00:00:00 2001 From: punkfairie Date: Tue, 9 May 2023 15:32:00 -0700 Subject: [PATCH] Switch Bootstrap from CDN to NPM package. --- index.html | 1 - package-lock.json | 55 +++++++++++++++++++++++++++++- package.json | 4 ++- src/interfaces/JournalInterface.js | 1 - src/renderer.js | 2 +- 5 files changed, 58 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index d9d0168..5bdea99 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,6 @@ ED Safari v0.0.1 - diff --git a/package-lock.json b/package-lock.json index 42012e6..6438fc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { + "bootstrap": "^5.3.0-alpha3", "chokidar": "^3.5.3", "electron-squirrel-startup": "^1.0.0", "glob": "^10.2.2", @@ -23,7 +24,8 @@ "@electron-forge/maker-squirrel": "^6.1.1", "@electron-forge/maker-zip": "^6.1.1", "@electron-forge/plugin-vite": "^6.1.1", - "electron": "24.2.0" + "electron": "24.2.0", + "sass": "^1.62.1" } }, "node_modules/@electron-forge/cli": { @@ -1125,6 +1127,16 @@ "node": ">=14" } }, + "node_modules/@popperjs/core": { + "version": "2.11.7", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz", + "integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw==", + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@sindresorhus/is": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", @@ -1537,6 +1549,24 @@ "dev": true, "optional": true }, + "node_modules/bootstrap": { + "version": "5.3.0-alpha3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.0-alpha3.tgz", + "integrity": "sha512-FBhOWMxkCFr74hesJdchLXhqagPTXS+kRNU3gE0FR5Ki/AdPSz32Ik96Z28+yBluCnE/pc9st7l1yPwKgbtfSA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/twbs" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/bootstrap" + } + ], + "peerDependencies": { + "@popperjs/core": "^2.11.7" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -3851,6 +3881,12 @@ } ] }, + "node_modules/immutable": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz", + "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==", + "dev": true + }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -5755,6 +5791,23 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, + "node_modules/sass": { + "version": "1.62.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz", + "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==", + "dev": true, + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/semver": { "version": "7.5.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz", diff --git a/package.json b/package.json index 07f524b..978a781 100644 --- a/package.json +++ b/package.json @@ -24,9 +24,11 @@ "@electron-forge/maker-squirrel": "^6.1.1", "@electron-forge/maker-zip": "^6.1.1", "@electron-forge/plugin-vite": "^6.1.1", - "electron": "24.2.0" + "electron": "24.2.0", + "sass": "^1.62.1" }, "dependencies": { + "bootstrap": "^5.3.0-alpha3", "chokidar": "^3.5.3", "electron-squirrel-startup": "^1.0.0", "glob": "^10.2.2", diff --git a/src/interfaces/JournalInterface.js b/src/interfaces/JournalInterface.js index e7aba85..3343bd9 100644 --- a/src/interfaces/JournalInterface.js +++ b/src/interfaces/JournalInterface.js @@ -191,7 +191,6 @@ export class JournalInterface extends EventEmitter { } log(`Scan detected. Body: ${line.BodyName}.`) - log(this.location.bodies) } /* -----------------------------------------------------------------------0000 parseLine ---- */ diff --git a/src/renderer.js b/src/renderer.js index 0da3adc..901ce9b 100644 --- a/src/renderer.js +++ b/src/renderer.js @@ -26,11 +26,11 @@ * ``` */ +import 'bootstrap/dist/css/bootstrap.min.css' import './assets/index.css' import './icons/flaticon.css' const { app } = require('electron') -import { createApp, ref } from 'https://unpkg.com/vue@3/dist/vue.esm-browser.js' import { JournalInterface } from './interfaces/JournalInterface' import { createBodyRow } from './ui'