Doradjene stranice.

5 files changed, 36 insertions, 2 deletions

diff --git a/frontend/angular.json b/frontend/angular.json
index 6653e4b1..f9825281 100644
--- a/frontend/angular.json
+++ b/frontend/angular.json
@@ -33,7 +33,10 @@
               "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
             ],
             "scripts": [
-              "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"
+              "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js",
+              "node_modules/jquery/dist/jquery.min.js",
+              "node_modules/popper.js/dist/popper.min.js",
+              "node_modules/bootstrap/dist/js/bootstrap.min.js"
             ]
           },
           "configurations": {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 962905b7..c79f4ea9 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -27,6 +27,7 @@
         "chart.js": "^3.7.1",
         "csv-parser": "^3.0.0",
         "d3-graphviz": "^2.6.1",
+        "jquery": "^3.6.0",
         "mdb-angular-ui-kit": "^2.0.0",
         "ng-multiselect-dropdown": "^0.3.8",
         "ng-uikit-pro-standard": "^1.0.0",
@@ -34,6 +35,7 @@
         "ng2-search-filter": "^0.5.1",
         "ngx-cookie-service": "^13.1.2",
         "ngx-csv-parser": "^0.0.7",
+        "popper.js": "^1.16.1",
         "rxjs": "~7.5.0",
         "tslib": "^2.3.1",
         "websocket-ts": "^1.1.1",
@@ -7082,6 +7084,11 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/jquery": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -9018,6 +9025,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
     "node_modules/portfinder": {
       "version": "1.0.28",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
@@ -16882,6 +16899,11 @@
         }
       }
     },
+    "jquery": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -18345,6 +18367,11 @@
         "find-up": "^4.0.0"
       }
     },
+    "popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
+    },
     "portfinder": {
       "version": "1.0.28",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 9df48b0c..ad68e176 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -30,6 +30,7 @@
     "chart.js": "^3.7.1",
     "csv-parser": "^3.0.0",
     "d3-graphviz": "^2.6.1",
+    "jquery": "^3.6.0",
     "mdb-angular-ui-kit": "^2.0.0",
     "ng-multiselect-dropdown": "^0.3.8",
     "ng-uikit-pro-standard": "^1.0.0",
@@ -37,6 +38,7 @@
     "ng2-search-filter": "^0.5.1",
     "ngx-cookie-service": "^13.1.2",
     "ngx-csv-parser": "^0.0.7",
+    "popper.js": "^1.16.1",
     "rxjs": "~7.5.0",
     "tslib": "^2.3.1",
     "websocket-ts": "^1.1.1",
diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
index 7b3e1bdb..27e06884 100644
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
+++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
@@ -5,7 +5,9 @@
         <div class="row mt-3 mb-2 d-flex justify-content-center">
     
     <div class="col-sm-6" style="margin-bottom: 10px;">
+      <p class="glyphicon glyphicon-search"></p>
     <input type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term">
+    
     </div>
 
             <div class="row">
diff --git a/frontend/src/app/_pages/my-models/my-models.component.html b/frontend/src/app/_pages/my-models/my-models.component.html
index ec6c83d5..4aebc1f2 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.html
+++ b/frontend/src/app/_pages/my-models/my-models.component.html
@@ -13,7 +13,7 @@
                     <div class="col-xs-6 text-center">
                         <div>
                           <button type="button" class="btn btn-default btn-lg" (click)="deleteThisModel(model)" mat-raised-button color="primary">Koristi
-                              <span class="glyphicon glyphicon-chevron-left"></span>
+                              <span class="glyphicon glyphicon-search"></span>
                           </button>
                           <button type="button" class="btn btn-default btn-lg" mat-raised-button color="primary" (click)="deleteThisModel(model)">Obriši
                             <span class="glyphicon glyphicon-chevron-right"></span>