From 095e5fd6488fd77ac8ba6c58e199528b64430a1e Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Wed, 23 Mar 2022 13:40:56 +0100
Subject: Dodata stranica za pretragu public prediktora.

---
 .../_pages/browse-predictors/browse-predictors.component.ts   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts')

diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
index b4fb2a9d..92952034 100644
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
+++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-
+import { PredictorsService } from 'src/app/_services/predictors.service';
+import Predictor from 'src/app/_data/Predictor';
 @Component({
   selector: 'app-browse-predictors',
   templateUrl: './browse-predictors.component.html',
@@ -7,7 +8,13 @@ import { Component, OnInit } from '@angular/core';
 })
 export class BrowsePredictorsComponent implements OnInit {
 
-  constructor() { }
+  myPredictors? :Predictor[];
+  term: string="";
+  constructor(private predictors: PredictorsService) {
+    this.predictors.getPublicPredictors().subscribe((predictors) => {
+      this.myPredictors = predictors;
+    });
+  }
 
   ngOnInit(): void {
   }
-- 
cgit v1.2.3


From 0d8e218c0d5082ffd390202d78e9fa9078ade71f Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Wed, 23 Mar 2022 13:56:10 +0100
Subject: Omoguceno da dugme otvara predictor stranicu.

---
 .../app/_pages/browse-predictors/browse-predictors.component.html   | 4 ++--
 .../src/app/_pages/browse-predictors/browse-predictors.component.ts | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts')

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 1626f6fc..9b342ad0 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,7 @@
         <div class="row mt-3 mb-2 d-flex justify-content-center">
     
     <div class="col-sm-6" style="margin-bottom: 10px;">
-    <input type="text" class="form-control" placeholder="Search Here" [(ngModel)]="term">
+    <input type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term">
     </div>
 
             <div class="row">
@@ -14,7 +14,7 @@
                     <div class="card-body">
                       <h5 class="card-title">{{predictor.name}}</h5>
                       <p class="card-text">{{predictor.description}}</p>
-                      <a href="#" class="btn btn-primary">Otvori</a>
+                      <a  class="btn btn-primary" (click)="openPredictor(predictor._id)">Otvori</a>
                     </div>
                     <div class="card-footer text-muted">
                         Kreirao: {{predictor.username}} <br>
diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
index 92952034..5c085bba 100644
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
+++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { PredictorsService } from 'src/app/_services/predictors.service';
 import Predictor from 'src/app/_data/Predictor';
+import {Router} from '@angular/router'
 @Component({
   selector: 'app-browse-predictors',
   templateUrl: './browse-predictors.component.html',
@@ -10,7 +11,7 @@ export class BrowsePredictorsComponent implements OnInit {
 
   myPredictors? :Predictor[];
   term: string="";
-  constructor(private predictors: PredictorsService) {
+  constructor(private predictors: PredictorsService,private router:Router) {
     this.predictors.getPublicPredictors().subscribe((predictors) => {
       this.myPredictors = predictors;
     });
@@ -18,5 +19,8 @@ export class BrowsePredictorsComponent implements OnInit {
 
   ngOnInit(): void {
   }
+  openPredictor(id:string):void{
+    this.router.navigateByUrl('/predict?id='+id);
+  };
 
 }
-- 
cgit v1.2.3


From 495607f3ce83d107e3a525c658e70355ec94d488 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Thu, 24 Mar 2022 00:03:04 +0100
Subject: Dodat api poziv u filter-datasets koji dodaje dataset.Ispravljene
 greske kod browse-predictors i filter-datasets.

---
 .../app/_pages/browse-predictors/browse-predictors.component.html   | 4 ++--
 .../src/app/_pages/browse-predictors/browse-predictors.component.ts | 4 ++--
 .../src/app/_pages/filter-datasets/filter-datasets.component.html   | 4 ++--
 .../src/app/_pages/filter-datasets/filter-datasets.component.ts     | 4 ++++
 frontend/src/app/_pages/home/home.component.html                    | 1 +
 frontend/src/app/_services/datasets.service.ts                      | 6 ++++++
 frontend/src/app/app-routing.module.ts                              | 4 +++-
 7 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts')

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 37ac67cf..a4ab6e2c 100644
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
+++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
@@ -9,7 +9,7 @@
     </div>
 
             <div class="row">
-                <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let predictor of myPredictors | filter:term">
+                <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let predictor of publicPredictors | filter:term">
                   <div class="card h-100">
                     <div class="card-body">
                       <h3 class="card-title"><b>{{predictor.name}}</b></h3>
@@ -25,7 +25,7 @@
                
 
               </div>
-              <div class="text-center"*ngIf="(myPredictors|filter:term).length === 0">
+              <div class="text-center"*ngIf="( publicPredictors != undefined && publicPredictors|filter:term).length === 0">
                 <h2>Nema rezultata</h2>
             </div>
         </div>
diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
index 5c085bba..4f96fc36 100644
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
+++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
@@ -9,11 +9,11 @@ import {Router} from '@angular/router'
 })
 export class BrowsePredictorsComponent implements OnInit {
 
-  myPredictors? :Predictor[];
+  publicPredictors? :Predictor[];
   term: string="";
   constructor(private predictors: PredictorsService,private router:Router) {
     this.predictors.getPublicPredictors().subscribe((predictors) => {
-      this.myPredictors = predictors;
+      this.publicPredictors = predictors;
     });
   }
 
diff --git a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.html b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.html
index bee07aef..84f5ebaf 100644
--- a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.html
+++ b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.html
@@ -14,7 +14,7 @@
                     <div class="card-body">
                       <h3 class="card-title"><b>{{dataset.name}}</b></h3>
                       <p class="card-text">{{dataset.description}}</p>
-                      <a  class="btn btn-primary" (click)="addDataset(dataset)">Dodaj dataset:</a>
+                      <a  class="btn btn-primary" (click)="addDataset(dataset)">Dodaj dataset</a>
                     </div>
                     <div class="card-footer text-muted">
                         Kreirao: {{dataset.username}} <br>
@@ -25,7 +25,7 @@
                
 
               </div>
-              <div class="text-center"*ngIf="(publicDatasets|filter:term).length === 0">
+              <div class="text-center"*ngIf="( publicDatasets != undefined && publicDatasets|filter:term).length === 0">
                 <h2>Nema rezultata</h2>
             </div>
         </div>
diff --git a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
index b2a3541d..bc13a51c 100644
--- a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
+++ b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
@@ -31,5 +31,9 @@ export class FilterDatasetsComponent implements OnInit {
     dataset.isPublic = false;
     dataset.lastUpdated = new Date();
     dataset.username = decodedToken.name;
+    this.datasets.addDataset(dataset).subscribe((response:string)=>{
+      console.log(response);
+    });
   };
+
 }
diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html
index 274f0fd8..689a302b 100644
--- a/frontend/src/app/_pages/home/home.component.html
+++ b/frontend/src/app/_pages/home/home.component.html
@@ -46,6 +46,7 @@
     </div>
     <h2 class="my-4">Pogledajte javne izvore podataka!</h2>
     <app-carousel [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>
diff --git a/frontend/src/app/_services/datasets.service.ts b/frontend/src/app/_services/datasets.service.ts
index 5a313632..fadcdeae 100644
--- a/frontend/src/app/_services/datasets.service.ts
+++ b/frontend/src/app/_services/datasets.service.ts
@@ -15,4 +15,10 @@ export class DatasetsService {
   getPublicDatasets(): Observable<Dataset[]> {
     return this.http.get<Dataset[]>(`${API_SETTINGS.apiURL}/Dataset/publicdatasets`, { headers: this.authService.authHeader() });
   }
+
+  addDataset(dataset:Dataset):any{
+    return this.http.post(`${API_SETTINGS.apiURL}/dataset/add`, dataset, { headers: this.authService.authHeader() });
+  }
+
+
 }
diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index 001d0b4f..a52d66a8 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -12,6 +12,7 @@ import { BrowseDatasetsComponent } from './_pages/browse-datasets/browse-dataset
 import { SettingsComponent } from './_pages/settings/settings.component';
 import { ProfileComponent } from './_pages/profile/profile.component';
 import { PredictComponent } from './_pages/predict/predict.component';
+import { FilterDatasetsComponent } from './_pages/filter-datasets/filter-datasets.component';
 
 const routes: Routes = [
   { path: '', component: HomeComponent, data: { title: 'Početna strana' } },
@@ -23,7 +24,8 @@ const routes: Routes = [
   { path: 'profile', component: ProfileComponent, canActivate: [AuthGuardService], data: { title: 'Profil' } },
   { path: 'browse-datasets', component: BrowseDatasetsComponent, data: { title: 'Javni izvori podataka' } },
   { path: 'browse-predictors', component: BrowsePredictorsComponent, data: { title: 'Javni trenirani modeli' } },
-  { path: 'predict', component: PredictComponent, data: { title: 'Predvidi vrednosti' } }
+  { path: 'predict', component: PredictComponent, data: { title: 'Predvidi vrednosti' } },
+  { path: 'filter-datasets', component: FilterDatasetsComponent, data: { title: 'Filter datasets' } }
 ];
 
 @NgModule({
-- 
cgit v1.2.3