Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

# Conflicts:
#	frontend/src/app/app.module.ts

1 files changed, 13 insertions, 2 deletions

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..4f96fc36 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,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',
@@ -7,9 +9,18 @@ import { Component, OnInit } from '@angular/core';
 })
 export class BrowsePredictorsComponent implements OnInit {
 
-  constructor() { }
+  publicPredictors? :Predictor[];
+  term: string="";
+  constructor(private predictors: PredictorsService,private router:Router) {
+    this.predictors.getPublicPredictors().subscribe((predictors) => {
+      this.publicPredictors = predictors;
+    });
+  }
 
   ngOnInit(): void {
   }
+  openPredictor(id:string):void{
+    this.router.navigateByUrl('/predict?id='+id);
+  };
 
 }