From ed0267929d48e1772acee288d653d9611a21dcfe Mon Sep 17 00:00:00 2001
From: Nevena Bojovic <nenabojov@gmail.com>
Date: Mon, 28 Mar 2022 09:30:47 +0200
Subject: Home component.

---
 frontend/src/app/_pages/home/home.component.html |  4 +--
 frontend/src/app/_pages/home/home.component.ts   | 32 +++++++-----------------
 2 files changed, 11 insertions(+), 25 deletions(-)

(limited to 'frontend/src/app/_pages/home')

diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html
index 7e895a2d..5f446a93 100644
--- a/frontend/src/app/_pages/home/home.component.html
+++ b/frontend/src/app/_pages/home/home.component.html
@@ -45,12 +45,12 @@
 
     </div>
     <h2 class="my-4">Pogledajte javne izvore podataka!</h2>
-    <app-carousel [items]="publicDatasets">
+    <app-carousel [*nglf = "publicDatasets" items]="publicDatasets">
 
     </app-carousel>
     <h3><a routerLink="browse-datasets">Pogledaj sve javne izvore podataka...</a></h3>
     <h2 class="my-4">Iskoristite već trenirane modele!</h2>
-    <app-carousel [items]="publicPredictors">
+    <app-carousel [*nglf = "publicPredictors" items]="publicPredictors">
     </app-carousel>
     <h3><a routerLink="browse-predictors">Pogledaj sve javne trenirane modele...</a></h3>
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/home/home.component.ts b/frontend/src/app/_pages/home/home.component.ts
index c9267e77..f52dcf52 100644
--- a/frontend/src/app/_pages/home/home.component.ts
+++ b/frontend/src/app/_pages/home/home.component.ts
@@ -13,32 +13,18 @@ import { PredictorsService } from 'src/app/_services/predictors.service';
 })
 export class HomeComponent implements OnInit {
 
-  publicDatasets: Dataset[];
-  publicPredictors: Predictor[];
+  publicDatasets?: Dataset[];
+  publicPredictors?: Predictor[];
 
   shared = shared;
 
-  constructor() {
-    this.publicDatasets = [
-      new Dataset('Titanik', 'Titanik', ['Kolona1', 'Kolona2', 'Ime', 'OsobaJePreživela']),
-      new Dataset('Drugi Dataset', 'Lorem ipsum dolor sir amet', ['jabuka', 'kruska', 'jagoda']),
-      new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5']),
-      new Dataset('Drugi Dataset', 'Lorem ipsum dolor sir amet', ['jabuka', 'kruska', 'jagoda']),
-      new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5']),
-      new Dataset('Drugi Dataset', 'Lorem ipsum dolor sir amet', ['jabuka', 'kruska', 'jagoda']),
-      new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5']),
-      new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5'])
-    ]
-    this.publicPredictors = [
-      new Predictor('Preživeli', 'Za uneto ime osobe, predvidja da li je ta osoba preživela ili ne.', ['Ime'], 'OsobaJePreživela'),
-      new Predictor('Drugi model', 'Lorem ipsum dolor sir amet', ['kruska'], 'jagoda'),
-      new Predictor('Treći model', 'Kratak opis modela', ['c1', 'c2', 'c3'], 'c5'),
-      new Predictor('Drugi model', 'Lorem ipsum dolor sir amet', ['kruska'], 'jagoda'),
-      new Predictor('Treći model', 'Kratak opis modela', ['c1', 'c2', 'c3'], 'c5'),
-      new Predictor('Drugi model', 'Lorem ipsum dolor sir amet', ['kruska'], 'jagoda'),
-      new Predictor('Treći model', 'Kratak opis modela', ['c1', 'c2', 'c3'], 'c5'),
-      new Predictor('Treći model', 'Kratak opis modela', ['c1', 'c2', 'c3'], 'c5')
-    ]
+  constructor(private datasetsService: DatasetsService, private predictorsService: PredictorsService) {
+    this.datasetsService.getPublicDatasets().subscribe((datasets) => {
+      this.publicDatasets = datasets;
+    });
+    this.predictorsService.getPublicPredictors().subscribe((predictors) => {
+      this.publicPredictors = predictors;
+    });
   }
 
   ngOnInit(): void {
-- 
cgit v1.2.3


From 11bae0bb6802de52f8629c1e466e249405621d29 Mon Sep 17 00:00:00 2001
From: Ivan Ljubisavljevic <ivan996sk@gmail.com>
Date: Mon, 28 Mar 2022 13:23:02 +0200
Subject: Resen problem sa pocetnom stranicom.

---
 .../src/app/_elements/item-predictor/item-predictor.component.html    | 2 +-
 frontend/src/app/_pages/home/home.component.html                      | 4 ++--
 frontend/src/app/_pages/home/home.component.ts                        | 1 +
 frontend/src/app/_pages/my-models/my-models.component.html            | 4 +++-
 frontend/src/app/_services/models.service.ts                          | 4 ++--
 frontend/src/app/_services/predictors.service.ts                      | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'frontend/src/app/_pages/home')

diff --git a/frontend/src/app/_elements/item-predictor/item-predictor.component.html b/frontend/src/app/_elements/item-predictor/item-predictor.component.html
index 92d747e2..b4690154 100644
--- a/frontend/src/app/_elements/item-predictor/item-predictor.component.html
+++ b/frontend/src/app/_elements/item-predictor/item-predictor.component.html
@@ -19,6 +19,6 @@
         </div>
     </div>
     <div class="card-footer text-center">
-        <a routerLink="predict" mat-raised-button color="primary">Iskoristi</a>
+        <a routerLink="/predict" mat-raised-button color="primary">Iskoristi</a>
     </div>
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html
index 5f446a93..eb59b726 100644
--- a/frontend/src/app/_pages/home/home.component.html
+++ b/frontend/src/app/_pages/home/home.component.html
@@ -45,12 +45,12 @@
 
     </div>
     <h2 class="my-4">Pogledajte javne izvore podataka!</h2>
-    <app-carousel [*nglf = "publicDatasets" items]="publicDatasets">
+    <app-carousel *ngIf = "publicDatasets" [items]="publicDatasets">
 
     </app-carousel>
     <h3><a routerLink="browse-datasets">Pogledaj sve javne izvore podataka...</a></h3>
     <h2 class="my-4">Iskoristite već trenirane modele!</h2>
-    <app-carousel [*nglf = "publicPredictors" items]="publicPredictors">
+    <app-carousel *ngIf = "publicPredictors" [items]="publicPredictors">
     </app-carousel>
     <h3><a routerLink="browse-predictors">Pogledaj sve javne trenirane modele...</a></h3>
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/home/home.component.ts b/frontend/src/app/_pages/home/home.component.ts
index f52dcf52..ed86a329 100644
--- a/frontend/src/app/_pages/home/home.component.ts
+++ b/frontend/src/app/_pages/home/home.component.ts
@@ -21,6 +21,7 @@ export class HomeComponent implements OnInit {
   constructor(private datasetsService: DatasetsService, private predictorsService: PredictorsService) {
     this.datasetsService.getPublicDatasets().subscribe((datasets) => {
       this.publicDatasets = datasets;
+      console.log(datasets);
     });
     this.predictorsService.getPublicPredictors().subscribe((predictors) => {
       this.publicPredictors = predictors;
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 870e0ddb..b6926771 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.html
+++ b/frontend/src/app/_pages/my-models/my-models.component.html
@@ -9,7 +9,9 @@
                 <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let model of myModels">
                 <app-item-model [model]="model"></app-item-model>
                 <div style="width: 25%; margin: auto;">
-                    <button (click)="deleteThisModel(model)" style="margin-top: 3px; width: 100%;">Obriši</button>
+                    <button mat-raised-button color="primary" (click)="deleteThisModel(model)" style="margin-top: 3px; width: 100%;">Obriši</button>
+                    
+                    <button mat-raised-button color="primary" (click)="deleteThisModel(model)" style="margin-top: 3px; width: 100%;">Koristi</button>
                 </div>
                 </div>
             </div>
diff --git a/frontend/src/app/_services/models.service.ts b/frontend/src/app/_services/models.service.ts
index 58ddb2e6..74253fac 100644
--- a/frontend/src/app/_services/models.service.ts
+++ b/frontend/src/app/_services/models.service.ts
@@ -52,8 +52,8 @@ export class ModelsService {
     return this.http.put<Model>(`${API_SETTINGS.apiURL}/model/`, model, { headers: this.authService.authHeader() });
   }
 
-  deleteModel(model:Model) : Observable<any>
+  deleteModel(model:Model) 
   {
-    return this.http.delete(`${API_SETTINGS.apiURL}/model/`+model.name, { headers: this.authService.authHeader() });
+    return this.http.delete(`${API_SETTINGS.apiURL}/model/`+model.name, { headers: this.authService.authHeader(), responseType : "text" });
   }
 }
diff --git a/frontend/src/app/_services/predictors.service.ts b/frontend/src/app/_services/predictors.service.ts
index 0cd7f0f6..a2dc012f 100644
--- a/frontend/src/app/_services/predictors.service.ts
+++ b/frontend/src/app/_services/predictors.service.ts
@@ -15,7 +15,7 @@ export class PredictorsService {
   constructor(private http: HttpClient, private authService: AuthService) { }
 
   getPublicPredictors(): Observable<Predictor[]> {
-    return this.http.get<Predictor[]>(`${API_SETTINGS.apiURL}/Predictor/publicpredictors`, { headers: this.authService.authHeader() });
+    return this.http.get<Predictor[]>(`${API_SETTINGS.apiURL}/predictor/publicpredictors`, { headers: this.authService.authHeader() });
   }
 
 }
-- 
cgit v1.2.3