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.

---
 .../browse-predictors.component.html               | 45 +++++++++++++++++++++-
 .../browse-predictors.component.ts                 | 11 +++++-
 2 files changed, 53 insertions(+), 3 deletions(-)

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

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 01c4af82..1626f6fc 100644
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
+++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
@@ -1 +1,44 @@
-<p>browse-predictors works!</p>
+
+<div id="wrapper">
+
+    <div id="container" class="container p-5" style="background-color: white; min-height: 100%;">
+        <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">
+    </div>
+
+            <div class="row">
+                <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let predictor of myPredictors | filter:term">
+                  <div class="card h-100">
+                    <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>
+                    </div>
+                    <div class="card-footer text-muted">
+                        Kreirao: {{predictor.username}} <br>
+                        Datum kreiranja: {{predictor.dateCreated |date}}
+                      </div>
+                  </div>
+                </div>
+               
+
+              </div>
+
+
+              
+
+
+
+
+
+
+
+
+
+
+
+        </div>
+    </div>
+</div>
\ No newline at end of file
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')

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 085a828f240b4e0a285e0c4ed4893fda6019c531 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Wed, 23 Mar 2022 14:25:49 +0100
Subject: Promenjen Stil.Dodata poruka ukolino nema rezultata.

---
 .../browse-predictors.component.css                |  7 +++++++
 .../browse-predictors.component.html               | 22 ++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

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

diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.css b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.css
index e69de29b..b4ac9669 100644
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.css
+++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.css
@@ -0,0 +1,7 @@
+#container {
+    border-radius: 8px;
+}
+
+#wrapper {
+    color: #003459;
+}
\ No newline at end of file
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 9b342ad0..37ac67cf 100644
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
+++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
@@ -12,7 +12,7 @@
                 <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let predictor of myPredictors | filter:term">
                   <div class="card h-100">
                     <div class="card-body">
-                      <h5 class="card-title">{{predictor.name}}</h5>
+                      <h3 class="card-title"><b>{{predictor.name}}</b></h3>
                       <p class="card-text">{{predictor.description}}</p>
                       <a  class="btn btn-primary" (click)="openPredictor(predictor._id)">Otvori</a>
                     </div>
@@ -25,20 +25,14 @@
                
 
               </div>
-
-
-              
-
-
-
-
-
-
-
-
+              <div class="text-center"*ngIf="(myPredictors|filter:term).length === 0">
+                <h2>Nema rezultata</h2>
+            </div>
+        </div>
+        
+    </div>
+    
 
 
 
-        </div>
-    </div>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3


From 7f3808f4393d7a09d9aa942be510804dd0a5d7f2 Mon Sep 17 00:00:00 2001
From: Nevena Bojovic <nenabojov@gmail.com>
Date: Wed, 23 Mar 2022 16:44:30 +0100
Subject: Dodata stranica.

---
 .../filter-datasets/filter-datasets.component.css  |  0
 .../filter-datasets/filter-datasets.component.html |  1 +
 .../filter-datasets.component.spec.ts              | 25 ++++++++++++++++++++++
 .../filter-datasets/filter-datasets.component.ts   | 15 +++++++++++++
 frontend/src/app/app.module.ts                     |  4 +++-
 5 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/app/_pages/filter-datasets/filter-datasets.component.css
 create mode 100644 frontend/src/app/_pages/filter-datasets/filter-datasets.component.html
 create mode 100644 frontend/src/app/_pages/filter-datasets/filter-datasets.component.spec.ts
 create mode 100644 frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts

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

diff --git a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.css b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.css
new file mode 100644
index 00000000..e69de29b
diff --git a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.html b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.html
new file mode 100644
index 00000000..fecf09a8
--- /dev/null
+++ b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.html
@@ -0,0 +1 @@
+<p>filter-datasets works!</p>
diff --git a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.spec.ts b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.spec.ts
new file mode 100644
index 00000000..6ab894fd
--- /dev/null
+++ b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FilterDatasetsComponent } from './filter-datasets.component';
+
+describe('FilterDatasetsComponent', () => {
+  let component: FilterDatasetsComponent;
+  let fixture: ComponentFixture<FilterDatasetsComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ FilterDatasetsComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FilterDatasetsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
new file mode 100644
index 00000000..4a143696
--- /dev/null
+++ b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-filter-datasets',
+  templateUrl: './filter-datasets.component.html',
+  styleUrls: ['./filter-datasets.component.css']
+})
+export class FilterDatasetsComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
index 09faa281..9d2bbc26 100644
--- a/frontend/src/app/app.module.ts
+++ b/frontend/src/app/app.module.ts
@@ -33,6 +33,7 @@ import { BrowsePredictorsComponent } from './_pages/browse-predictors/browse-pre
 import { PredictComponent } from './_pages/predict/predict.component';
 import { ScatterchartComponent } from './scatterchart/scatterchart.component';
 import { BarchartComponent } from './barchart/barchart.component';
+import { FilterDatasetsComponent } from './_pages/filter-datasets/filter-datasets.component';
 
 @NgModule({
   declarations: [
@@ -55,7 +56,8 @@ import { BarchartComponent } from './barchart/barchart.component';
     BrowsePredictorsComponent,
     PredictComponent,
     ScatterchartComponent,
-    BarchartComponent
+    BarchartComponent,
+    FilterDatasetsComponent
   ],
   imports: [
     BrowserModule,
-- 
cgit v1.2.3