Merge branch 'master' into dependabot/npm_and_yarn/xmldom/xmldom-0.8.7

philippeBron · Sep 1, 2023 · 5ee9595 · 5ee9595
2 parents 61c0b7a + 5d935fe
commit 5ee9595
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 30 deletions.
diff --git a/assets/js/bootstrap.min.js b/assets/js/bootstrap.min.js
diff --git a/fouilles.js b/fouilles.js
@@ -1,10 +1,10 @@
-const path = require('path');
+const path = require('node:path')
 
 const { rejects } = require('assert')
 
 const initApp = () => {
     const db = require('electron-db')
-    const path = require('path')
+    const path = require('node:path')
     const location = path.join(__dirname, './')
     const selectAnnee = document.getElementById('annee')
     const selectCategorie = document.getElementById('categorie')

diff --git a/loadCarroyageWindow.html b/loadCarroyageWindow.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link rel="stylesheet" href="./assets/css/bootstrap.css">
     <link rel="stylesheet" href="./assets/css/bootstrap-theme.css">
-    <script src="./assets/js/bootstrap.js"></script>
+    <script src="./assets/js/bootstrap.min.js"></script>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <script src="./fouilles.js"></script>

diff --git a/loadDataWindow.html b/loadDataWindow.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link rel="stylesheet" href="./assets/css/bootstrap.css">
     <link rel="stylesheet" href="./assets/css/bootstrap-theme.css">
-    <script src="./assets/js/bootstrap.js"></script>
+    <script src="./assets/js/bootstrap.min.js"></script>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <script src="./fouilles.js"></script>

diff --git a/main.js b/main.js
@@ -1,7 +1,11 @@
-const electron = require('electron')
+const { 
+    app, 
+    BrowserWindow, 
+    Menu, 
+    ipcMain 
+} = require('electron')
 const url = require('url')
-const path = require('path');
-const { app, BrowserWindow, Menu, ipcMain } = electron
+const path = require('path')
 
 // Set environment
 process.env.NODE_ENV = 'production'
@@ -18,7 +22,8 @@ app.on('ready', () => {
         width: 1200,
         height: 1024,
         webPreferences: {
-            nodeIntegration: true
+            nodeIntegration: true,
+            contextIsolation: false
         }
     })
     // Load html into window
@@ -46,7 +51,8 @@ const createHelpWindow = () => {
         height: 600,
         title: 'Aide',
         webPreferences: {
-            nodeIntegration: true
+            nodeIntegration: true,
+            contextIsolation: false
         }
     })
     helpWindow.loadURL(url.format({
@@ -67,7 +73,8 @@ const createLoadDataWindow = () => {
         height: 600,
         title: 'Chargement',
         webPreferences: {
-            nodeIntegration: true
+            nodeIntegration: true,
+            contextIsolation: false
         }
     })
     loadDataWindow.loadURL(url.format({
@@ -88,7 +95,8 @@ const createLoadCarroyageWindow = () => {
         height: 600,
         title: 'Chargement',
         webPreferences: {
-            nodeIntegration: true
+            nodeIntegration: true,
+            contextIsolation: false
         }
     })
     loadCarroyageWindow.loadURL(url.format({

diff --git a/mainWindow.html b/mainWindow.html
@@ -3,7 +3,7 @@
 <head><meta charset="utf-8" />
     <link rel="stylesheet" href="./assets/css/bootstrap.css">
     <link rel="stylesheet" href="./assets/css/bootstrap-theme.css">
-    <script src="./assets/js/bootstrap.js"></script>
+    <script src="./assets/js/bootstrap.min.js"></script>
 
     <script src="./fouilles.js"></script>
     <title>Corroyage de Morimond</title>

diff --git a/package-lock.json b/package-lock.json