From 0515fbb873f8e9720c6c853d2997abf71feefa90 Mon Sep 17 00:00:00 2001
From: Eric Fernandez <efernandez@focasoftware.com>
Date: Mon, 5 Aug 2019 11:55:27 -0300
Subject: [PATCH] no app setings

---
 angular.json                  |  7 +++++--
 package-lock.json             | 15 +++++++++++++++
 package.json                  |  3 +++
 src/app/app-routing.module.ts |  6 +++---
 src/etc/AppSetings.ts         |  3 ---
 src/index.html                |  3 ---
 src/styles.css                |  1 +
 7 files changed, 27 insertions(+), 11 deletions(-)
 delete mode 100644 src/etc/AppSetings.ts

diff --git a/angular.json b/angular.json
index 1f1f25a..8967106 100644
--- a/angular.json
+++ b/angular.json
@@ -23,9 +23,12 @@
               "src/assets"
             ],
             "styles": [
-              "src/styles.css"
+              "src/styles.css",
+              "node_modules/bootstrap/dist/css/bootstrap.min.css"
             ],
-            "scripts": []
+            "scripts": [
+              "node_modules/bootstrap/dist/js/bootstrap.min.js"
+            ]
           },
           "configurations": {
             "production": {
diff --git a/package-lock.json b/package-lock.json
index 3e1b8b1..a893d58 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1575,6 +1575,11 @@
         "multicast-dns-service-types": "^1.1.0"
       }
     },
+    "bootstrap": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz",
+      "integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag=="
+    },
     "bplist-parser": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
@@ -5523,6 +5528,11 @@
       "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=",
       "dev": true
     },
+    "jquery": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-1.9.1.tgz",
+      "integrity": "sha1-5M1INfqu+63lNYV2E8D8P/KtrzQ="
+    },
     "js-tokens": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -7197,6 +7207,11 @@
         "xmldom": "0.1.x"
       }
     },
+    "popper.js": {
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.7.tgz",
+      "integrity": "sha512-4q1hNvoUre/8srWsH7hnoSJ5xVmIL4qgz+s4qf2TnJIMyZFUFMGH+9vE7mXynAlHSZ/NdTmmow86muD0myUkVQ=="
+    },
     "portfinder": {
       "version": "1.0.20",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
diff --git a/package.json b/package.json
index 3358176..164fd15 100644
--- a/package.json
+++ b/package.json
@@ -25,9 +25,12 @@
     "@angular/router": "~8.0.0",
     "@ng-bootstrap/ng-bootstrap": "^4.2.0",
     "angular2-ladda": "^2.0.1",
+    "bootstrap": "^4.3.1",
     "cordova-android": "^8.0.0",
     "electron-debug": "^3.0.1",
     "font-awesome": "^4.7.0",
+    "jquery": "^1.9.1",
+    "popper.js": "^1.14.7",
     "rxjs": "~6.4.0",
     "tslib": "^1.9.0",
     "zone.js": "~0.9.1"
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 77dec73..97abdb5 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -20,9 +20,9 @@ export class AppRoutingModule {
 
   constructor(private router: Router, private modalService: NgbModal) {
 
-    router.events.subscribe(() => {
-      modalService.dismissAll();
-    })
+    // this.router.events.subscribe(() => {
+    //   this.modalService.dismissAll();
+    // });
   }
 
 }
diff --git a/src/etc/AppSetings.ts b/src/etc/AppSetings.ts
deleted file mode 100644
index 4be5f56..0000000
--- a/src/etc/AppSetings.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export class AppSetings {
-  public static END_POINT='http://localhost:6060/gateway-debo';
-}
diff --git a/src/index.html b/src/index.html
index b2725aa..e27b679 100644
--- a/src/index.html
+++ b/src/index.html
@@ -7,9 +7,6 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="assets/img/logo.png">
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-  
-  <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
   <script type="text/javascript" src="cordova.js"></script>
 </head>
diff --git a/src/styles.css b/src/styles.css
index 75b00d2..1e37ef1 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -1,6 +1,7 @@
 /* You can add global styles to this file, and also import other style files */
 @import '../node_modules/font-awesome/css/font-awesome.min.css';
 @import '../node_modules/ladda/dist/ladda.min.css';
+@import '../node_modules/bootstrap/dist/css/bootstrap.min.css';
 
 body {
   background-color: #cccccc;
-- 
1.9.1