From 095e5fd6488fd77ac8ba6c58e199528b64430a1e Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic 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 +++++- .../src/app/_services/predictors.service.spec.ts | 16 ++++++++ frontend/src/app/_services/predictors.service.ts | 21 ++++++++++ frontend/src/app/app.module.ts | 5 ++- 5 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 frontend/src/app/_services/predictors.service.spec.ts create mode 100644 frontend/src/app/_services/predictors.service.ts (limited to 'frontend/src/app') 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 @@ -

browse-predictors works!

+ +
+ +
+
+ +
+ +
+ +
+
+
+
+
{{predictor.name}}
+

{{predictor.description}}

+ Otvori +
+
+ Kreirao: {{predictor.username}}
+ Datum kreiranja: {{predictor.dateCreated |date}} +
+
+
+ + +
+ + + + + + + + + + + + + + +
+
+
\ 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 { } diff --git a/frontend/src/app/_services/predictors.service.spec.ts b/frontend/src/app/_services/predictors.service.spec.ts new file mode 100644 index 00000000..7733780b --- /dev/null +++ b/frontend/src/app/_services/predictors.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { PredictorsService } from './predictors.service'; + +describe('PredictorsService', () => { + let service: PredictorsService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(PredictorsService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/_services/predictors.service.ts b/frontend/src/app/_services/predictors.service.ts new file mode 100644 index 00000000..0cd7f0f6 --- /dev/null +++ b/frontend/src/app/_services/predictors.service.ts @@ -0,0 +1,21 @@ +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; +import { API_SETTINGS } from 'src/config'; +import Predictor from '../_data/Predictor'; +import { AuthService } from './auth.service'; + +@Injectable({ + providedIn: 'root' +}) +export class PredictorsService { + + + + constructor(private http: HttpClient, private authService: AuthService) { } + + getPublicPredictors(): Observable { + return this.http.get(`${API_SETTINGS.apiURL}/Predictor/publicpredictors`, { headers: this.authService.authHeader() }); + } + +} diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 7f076421..09faa281 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -7,7 +7,7 @@ import { MatSliderModule } from '@angular/material/slider'; import { MatIconModule } from '@angular/material/icon'; import {NgChartsModule} from 'ng2-charts'; - +import { Ng2SearchPipe, Ng2SearchPipeModule } from 'ng2-search-filter'; import { AppComponent } from './app.component'; import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DatasetLoadComponent } from './_elements/dataset-load/dataset-load.component'; @@ -68,7 +68,8 @@ import { BarchartComponent } from './barchart/barchart.component'; ReactiveFormsModule, MatSliderModule, MatIconModule, - NgChartsModule + NgChartsModule, + Ng2SearchPipeModule ], providers: [], bootstrap: [AppComponent] -- cgit v1.2.3 From 0d8e218c0d5082ffd390202d78e9fa9078ade71f Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic 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') 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 @@
- +
@@ -14,7 +14,7 @@
{{predictor.name}}

{{predictor.description}}

- Otvori + Otvori
Kreirao: {{predictor.username}}
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 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') 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 @@
-
{{predictor.name}}
+

{{predictor.name}}

{{predictor.description}}

Otvori
@@ -25,20 +25,14 @@
- - - - - - - - - - - +
+

Nema rezultata

+
+
+ +
+ -
-
\ No newline at end of file -- cgit v1.2.3 From 7f3808f4393d7a09d9aa942be510804dd0a5d7f2 Mon Sep 17 00:00:00 2001 From: Nevena Bojovic 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') 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 @@ +

filter-datasets works!

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; + + 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