Merge pull request #89 from acrosman/issue-87

Updates to Bootstrap Fix
acrosman · Apr 3, 2023 · 1736685 · 1736685
2 parents 24cc46c + d5f79f6
commit 1736685
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 48 deletions.
diff --git a/app/dashboard.css b/app/dashboard.css
@@ -0,0 +1,4 @@
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
diff --git a/app/index.html b/app/index.html
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 
 <head>
     <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta http-equiv="Content-Security-Policy"
         content="default-src 'self'; font-src https://fonts.gstatic.com; style-src 'self' https://fonts.googleapis.com; img-src 'self' data:">
     <link rel="stylesheet" href="../node_modules/bootswatch/dist/cyborg/bootstrap.min.css">
@@ -17,7 +18,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title" id="consoleModalLabel">Message Console</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true">&times;</span>
                     </button>
                 </div>
@@ -37,7 +38,7 @@ <h5 class="modal-title" id="consoleModalLabel">Message Console</h5>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-primary" data-count="0" id="log-console-load-more">Load
                         More</button>
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
                 </div>
             </div>
         </div>
@@ -54,8 +55,8 @@ <h1 class="header">
                             This is a Salesforce API interface build using JSForce and Electron. It allows basic
                             interactions with Salesforce remote APIs to assist development and testing.
                         </p>
-                        <button type="button" class="btn btn-info btn-lg" data-toggle="modal"
-                            data-target="#loginModal">Create New Connection</button>
+                        <button type="button" class="btn btn-info btn-lg" data-bs-toggle="modal"
+                            data-bs-target="#loginModal">Create New Connection</button>
                     </div>
                     <div class="card-footer" id="org-status">
                         <label for="active-org">Active Org for next action.</label>
@@ -71,7 +72,7 @@ <h1 class="header">
                             <div class="modal-content">
                                 <div class="modal-header">
                                     <h5 class="modal-title" id="loginModalLabel">Enter Salesforce Login</h5>
-                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                    <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
                                         <span aria-hidden="true">&times;</span>
                                     </button>
                                 </div>
@@ -105,9 +106,10 @@ <h5 class="modal-title" id="loginModalLabel">Enter Salesforce Login</h5>
                                     </form>
                                 </div>
                                 <div class="modal-footer">
-                                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                                    <button type="button" class="btn btn-secondary"
+                                        data-bs-dismiss="modal">Close</button>
                                     <button type="button" class="btn btn-primary" id="login-trigger"
-                                        data-dismiss="modal">Connect</button>
+                                        data-bs-dismiss="modal">Connect</button>
                                 </div>
                             </div>
                         </div>
@@ -119,7 +121,7 @@ <h5 class="modal-title" id="loginModalLabel">Enter Salesforce Login</h5>
                     <h2>Last Response:</h2>
                     <pre id="raw-response" class="pre-scrollable"></pre>
                     <button type="button" id="show-console" class="btn btn-info" value="Show Log Console"
-                        data-toggle="modal" data-target="#consoleModal">Show Log Console</button>
+                        data-bs-toggle="modal" data-bs-target="#consoleModal">Show Log Console</button>
                 </div>
             </div>
         </div>
@@ -267,8 +269,8 @@ <h3></h3>
         </div>
 </body>
 <script src="../node_modules/jquery/dist/jquery.min.js"></script>
-<script src="../node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
+<script src="../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
 <script src="../node_modules/jquery.json-viewer/json-viewer/jquery.json-viewer.js"></script>
 <script src="render.js"></script>
 
-</html>
+</html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,14 +25,13 @@
     "url": "https://github.com/acrosman/electronForce"
   },
   "dependencies": {
-    "bootstrap": "^4.5.3",
-    "bootswatch": "^4.5.3",
+    "bootstrap": "^5",
+    "bootswatch": "^5",
     "electron-squirrel-startup": "^1.0.0",
     "jquery": "^3.5.1",
     "jquery.json-viewer": "^1.5.0",
     "jsforce": "^1.10.1",
-    "minimist": "^1.2.6",
-    "popper.js": "^1.16.1"
+    "minimist": "^1.2.6"
   },
   "devDependencies": {
     "@electron-forge/cli": "^6.0",