Reorganizovao stranice i komponente.

33 files changed, 44 insertions, 741 deletions

diff --git a/frontend/src/app/_pages/browse-datasets/browse-datasets.component.css b/frontend/src/app/_pages/archive/archive.component.css
index e69de29b..e69de29b 100644
--- a/frontend/src/app/_pages/browse-datasets/browse-datasets.component.css
+++ b/frontend/src/app/_pages/archive/archive.component.css
diff --git a/frontend/src/app/_pages/archive/archive.component.html b/frontend/src/app/_pages/archive/archive.component.html
new file mode 100644
index 00000000..44c4d9c2
--- /dev/null
+++ b/frontend/src/app/_pages/archive/archive.component.html
@@ -0,0 +1 @@
+<p>archive works!</p>
diff --git a/frontend/src/app/_pages/predict/predict.component.spec.ts b/frontend/src/app/_pages/archive/archive.component.spec.ts
index 65871ecc..41fc8e77 100644
--- a/frontend/src/app/_pages/predict/predict.component.spec.ts
+++ b/frontend/src/app/_pages/archive/archive.component.spec.ts
@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { PredictComponent } from './predict.component';
+import { ArchiveComponent } from './archive.component';
 
-describe('PredictComponent', () => {
-  let component: PredictComponent;
-  let fixture: ComponentFixture<PredictComponent>;
+describe('ArchiveComponent', () => {
+  let component: ArchiveComponent;
+  let fixture: ComponentFixture<ArchiveComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ PredictComponent ]
+      declarations: [ ArchiveComponent ]
     })
     .compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(PredictComponent);
+    fixture = TestBed.createComponent(ArchiveComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/frontend/src/app/_pages/archive/archive.component.ts b/frontend/src/app/_pages/archive/archive.component.ts
new file mode 100644
index 00000000..e3ffd6e2
--- /dev/null
+++ b/frontend/src/app/_pages/archive/archive.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-archive',
+  templateUrl: './archive.component.html',
+  styleUrls: ['./archive.component.css']
+})
+export class ArchiveComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/frontend/src/app/_pages/browse-datasets/browse-datasets.component.html b/frontend/src/app/_pages/browse-datasets/browse-datasets.component.html
deleted file mode 100644
index fa38a1bc..00000000
--- a/frontend/src/app/_pages/browse-datasets/browse-datasets.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>browse-datasets works!</p>
diff --git a/frontend/src/app/_pages/browse-datasets/browse-datasets.component.spec.ts b/frontend/src/app/_pages/browse-datasets/browse-datasets.component.spec.ts
deleted file mode 100644
index fda74dbe..00000000
--- a/frontend/src/app/_pages/browse-datasets/browse-datasets.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BrowseDatasetsComponent } from './browse-datasets.component';
-
-describe('BrowseDatasetsComponent', () => {
-  let component: BrowseDatasetsComponent;
-  let fixture: ComponentFixture<BrowseDatasetsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ BrowseDatasetsComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(BrowseDatasetsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/frontend/src/app/_pages/browse-datasets/browse-datasets.component.ts b/frontend/src/app/_pages/browse-datasets/browse-datasets.component.ts
deleted file mode 100644
index dba6c25e..00000000
--- a/frontend/src/app/_pages/browse-datasets/browse-datasets.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-browse-datasets',
-  templateUrl: './browse-datasets.component.html',
-  styleUrls: ['./browse-datasets.component.css']
-})
-export class BrowseDatasetsComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
-}
diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.css b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.css
deleted file mode 100644
index b4ac9669..00000000
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.css
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
deleted file mode 100644
index 27e06884..00000000
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<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;">
-      <p class="glyphicon glyphicon-search"></p>
-    <input type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term">
-    
-    </div>
-
-            <div class="row">
-                <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>
-                      <p class="card-text">{{predictor.description}}</p>
-                      <a  class="btn btn-primary" (click)="openPredictor(predictor._id)">Iskoristi</a>
-                    </div>
-                    <div class="card-footer text-muted">
-                        Kreirao: {{predictor.username}} <br>
-                        Datum kreiranja: {{predictor.dateCreated |date}}
-                      </div>
-                  </div>
-                </div>
-               
-
-              </div>
-              <div class="text-center"*ngIf="( publicPredictors != undefined && publicPredictors|filter:term).length === 0">
-                <h2>Nema rezultata</h2>
-            </div>
-        </div>
-        
-    </div>
-    
-
-
-
-</div>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.spec.ts b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.spec.ts
deleted file mode 100644
index 6d13fedf..00000000
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { BrowsePredictorsComponent } from './browse-predictors.component';
-
-describe('BrowsePredictorsComponent', () => {
-  let component: BrowsePredictorsComponent;
-  let fixture: ComponentFixture<BrowsePredictorsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ BrowsePredictorsComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(BrowsePredictorsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
deleted file mode 100644
index 891b3cab..00000000
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-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',
-  styleUrls: ['./browse-predictors.component.css']
-})
-export class BrowsePredictorsComponent implements OnInit {
-
-  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.navigate(['predict/'+id]);
-  };
-
-}
diff --git a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.css b/frontend/src/app/_pages/experiment/experiment.component.css
index e69de29b..e69de29b 100644
--- a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.css
+++ b/frontend/src/app/_pages/experiment/experiment.component.css
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html
new file mode 100644
index 00000000..bcecd284
--- /dev/null
+++ b/frontend/src/app/_pages/experiment/experiment.component.html
@@ -0,0 +1 @@
+<p>experiment works!</p>
diff --git a/frontend/src/app/_pages/my-models/my-models.component.spec.ts b/frontend/src/app/_pages/experiment/experiment.component.spec.ts
index e431d04c..fd2bbd30 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.spec.ts
+++ b/frontend/src/app/_pages/experiment/experiment.component.spec.ts
@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { MyModelsComponent } from './my-models.component';
+import { ExperimentComponent } from './experiment.component';
 
-describe('MyModelsComponent', () => {
-  let component: MyModelsComponent;
-  let fixture: ComponentFixture<MyModelsComponent>;
+describe('ExperimentComponent', () => {
+  let component: ExperimentComponent;
+  let fixture: ComponentFixture<ExperimentComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ MyModelsComponent ]
+      declarations: [ ExperimentComponent ]
     })
     .compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(MyModelsComponent);
+    fixture = TestBed.createComponent(ExperimentComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts
new file mode 100644
index 00000000..16de7351
--- /dev/null
+++ b/frontend/src/app/_pages/experiment/experiment.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-experiment',
+  templateUrl: './experiment.component.html',
+  styleUrls: ['./experiment.component.css']
+})
+export class ExperimentComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.html b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.html
deleted file mode 100644
index 84f5ebaf..00000000
--- a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-<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="Pretraga" [(ngModel)]="term">
-    </div>
-
-            <div class="row">
-                <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let dataset of publicDatasets | filter:term">
-                  <div class="card h-100">
-                    <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>
-                    </div>
-                    <div class="card-footer text-muted">
-                        Kreirao: {{dataset.username}} <br>
-                        Datum kreiranja: {{dataset.dateCreated |date}}
-                      </div>
-                  </div>
-                </div>
-               
-
-              </div>
-              <div class="text-center"*ngIf="( publicDatasets != undefined && publicDatasets|filter:term).length === 0">
-                <h2>Nema rezultata</h2>
-            </div>
-        </div>
-        
-    </div>
-    
-
-
-
-</div>
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
deleted file mode 100644
index 6ab894fd..00000000
--- a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 66b3755e..00000000
--- a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { DatasetsService } from 'src/app/_services/datasets.service';
-import Dataset from 'src/app/_data/Dataset';
-import {Router} from '@angular/router'
-import { JwtHelperService } from '@auth0/angular-jwt';
-import { CookieService } from 'ngx-cookie-service';
-import shared from 'src/app/Shared';
-
-@Component({
-  selector: 'app-filter-datasets',
-  templateUrl: './filter-datasets.component.html',
-  styleUrls: ['./filter-datasets.component.css']
-})
-export class FilterDatasetsComponent implements OnInit {
-
-  shared = shared;
-  publicDatasets?: Dataset[];
-  term: string = "";
-  constructor(private datasets: DatasetsService,private router:Router, private cookie: CookieService) {
-    this.datasets.getPublicDatasets().subscribe((datasets) => {
-      this.publicDatasets = datasets;
-    });
-  }
-
-  ngOnInit(): void {
-
-  }
-  addDataset(dataset: Dataset):void{
-    //this.router.navigateByUrl('/predict?id='+id);
-    const helper = new JwtHelperService();
-    const decodedToken = helper.decodeToken(this.cookie.get("token"));
-    const newDataset={...dataset};
-    newDataset._id = "";
-    newDataset.isPublic = false;
-    newDataset.lastUpdated = new Date();
-    newDataset.uploaderId = decodedToken.uploaderId;
-    let name=prompt("Unesite naziv dataset-a",newDataset.name);
-    newDataset.name=name as string;
-    if(name!=null && name!="")
-    this.datasets.addDataset(newDataset).subscribe((response:string)=>{
-      shared.openDialog("Obaveštenje", "Uspešno ste dodali dataset sa nazivom " + newDataset.name);
-    },(error)=>{
-      shared.openDialog("Obaveštenje", "U svojoj kolekciji već imate dataset sa ovim imenom. Molimo Vas da unesete drugo ime.");
-    });
-  
-  };
-
-}
diff --git a/frontend/src/app/_pages/home/home.component.ts b/frontend/src/app/_pages/home/home.component.ts
index 0575c4c0..28ba2cbb 100644
--- a/frontend/src/app/_pages/home/home.component.ts
+++ b/frontend/src/app/_pages/home/home.component.ts
@@ -1,7 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import Dataset from 'src/app/_data/Dataset';
 import Predictor from 'src/app/_data/Predictor';
-import { ItemDatasetComponent } from 'src/app/_elements/item-dataset/item-dataset.component';
 import shared from 'src/app/Shared';
 import { DatasetsService } from 'src/app/_services/datasets.service';
 import { PredictorsService } from 'src/app/_services/predictors.service';
@@ -14,7 +13,6 @@ import { PredictorsService } from 'src/app/_services/predictors.service';
 export class HomeComponent implements OnInit {
 
   publicDatasets: Dataset[] = [];
-  publicPredictors: Predictor[] = [];
 
   shared = shared;
 
@@ -25,9 +23,6 @@ export class HomeComponent implements OnInit {
         this.publicDatasets[index] = (<Dataset>element);
       })
     });
-    this.predictorsService.getPublicPredictors().subscribe((predictors) => {
-      this.publicPredictors = predictors;
-    });
   }
 
   ngOnInit(): void {
diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.css b/frontend/src/app/_pages/my-datasets/my-datasets.component.css
deleted file mode 100644
index 57889937..00000000
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.css
+++ /dev/null
@@ -1,8 +0,0 @@
-#header {
-    background-color: #003459;
-    padding-top: 20px;
-    padding-bottom: 15px;
-    text-align: center;
-    color: white;
-    border-radius: 5px;
-}
\ No newline at end of file
diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.html b/frontend/src/app/_pages/my-datasets/my-datasets.component.html
deleted file mode 100644
index 0c83dc85..00000000
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<div id="header">
-    <h1>Moji setovi podataka</h1>
-</div>
-<div id="wrapper">
-    <div id="container" class="container p-5" style="background-color: rgba(255, 255, 255, 0.8); min-height: 100%;">
-        <div class="row mt-3 mb-2 d-flex justify-content-center">
-        
-        <div class="col-sm-6" style="margin-bottom: 10px;">
-        </div>
-        
-            <div class="row">
-                <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let dataset of myDatasets">
-                    <app-item-dataset [dataset]="dataset"></app-item-dataset>
-                    
-                    <div class="panel-footer row"><!-- panel-footer -->
-                        <div class="col-xs-6 text-center">
-                            <div>
-                                <div>
-                                    <button (click)="deleteThisDataset(dataset)" mat-raised-button color="warn" style="min-width: 10rem;float: right" ><mat-icon>delete</mat-icon></button>
-                                </div>
-                            
-                            </div>
-                        </div>
-                    </div><!-- end panel-footer -->
-                </div>
-            </div>
-        <div class="text-center" *ngIf="this.myDatasets.length == 0" >
-        <h2>Nema rezultata</h2>
-        </div>
-        </div>
-        
-    
-    </div>
-    
-    
-    
-    
-    
-    </div>
diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.spec.ts b/frontend/src/app/_pages/my-datasets/my-datasets.component.spec.ts
deleted file mode 100644
index fc1fc3f3..00000000
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MyDatasetsComponent } from './my-datasets.component';
-
-describe('MyDatasetsComponent', () => {
-  let component: MyDatasetsComponent;
-  let fixture: ComponentFixture<MyDatasetsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ MyDatasetsComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MyDatasetsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
deleted file mode 100644
index 8857e371..00000000
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import {Router} from '@angular/router';
-import { DatasetsService } from 'src/app/_services/datasets.service';
-import Dataset from 'src/app/_data/Dataset';
-import { JwtHelperService } from '@auth0/angular-jwt';
-import { CookieService } from 'ngx-cookie-service';
-import shared from 'src/app/Shared';
-import { share } from 'rxjs';
-
-@Component({
-  selector: 'app-my-datasets',
-  templateUrl: './my-datasets.component.html',
-  styleUrls: ['./my-datasets.component.css']
-})
-export class MyDatasetsComponent implements OnInit {
-  myDatasets: Dataset[] = [];
-
-  constructor(private datasetsS : DatasetsService) {
-
-    
-
-     }
-
-     ngOnInit(): void {
-
-      this.datasetsS.getMyDatasets().subscribe((response) => {
-        this.myDatasets = response;
-      }, (error) => {
-        if (error.error == "Dataset with...") {
-          shared.openDialog("Greska", "Niste dobro uneli nesto");
-        }
-      });
-    }  
-    
-/*
-  editModel(): void{
-    this.modelsS.editModel().subscribe(m => {
-      this.myModel = m;
-
-    })
-  }
-*/
-
-deleteThisDataset(dataset: Dataset): void{
-  shared.openYesNoDialog('Brisanje seta podataka','Da li ste sigurni da želite da obrišete ovaj set podataka?',() => {  
-  this.datasetsS.deleteDataset(dataset).subscribe((response) => {
-    this.getAllMyDatasets();
-  }, (error) =>{
-      if (error.error == "Dataset with name = {name} deleted") {
-        shared.openDialog("Greška","Greška pri brisanju dataseta!");
-      }
-    });
-  });
-}
-
-  getAllMyDatasets(): void{
-    this.datasetsS.getMyDatasets().subscribe(m => {
-      this.myDatasets = m;
-    });
-  }
-  
-
-}
diff --git a/frontend/src/app/_pages/my-models/my-models.component.css b/frontend/src/app/_pages/my-models/my-models.component.css
deleted file mode 100644
index 19d29595..00000000
--- a/frontend/src/app/_pages/my-models/my-models.component.css
+++ /dev/null
@@ -1,12 +0,0 @@
-button{
-    margin-left: 5%;
-    margin-right: 5%;
-}
-#header {
-    background-color: #003459;
-    padding-top: 20px;
-    padding-bottom: 15px;
-    text-align: center;
-    color: white;
-    border-radius: 5px;
-}
\ No newline at end of file
diff --git a/frontend/src/app/_pages/my-models/my-models.component.html b/frontend/src/app/_pages/my-models/my-models.component.html
deleted file mode 100644
index 9b281239..00000000
--- a/frontend/src/app/_pages/my-models/my-models.component.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<div id="header">
-    <h1>Moji modeli</h1>
-</div>
-<div id="wrapper">
-    <div id="container" class="container p-5" style="background-color: rgba(255, 255, 255, 0.8); min-height: 100%;">
-        <div class="row mt-3 mb-2 d-flex justify-content-center">
-        
-        <div class="col-sm-6" style="margin-bottom: 10px;">
-        </div>
-        
-            <div class="row">
-                <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let model of myModels">
-                <app-item-model [model]="model"></app-item-model>
-                
-                <div class="panel-footer row"><!-- panel-footer -->
-                    <div class="col-xs-6 text-center">
-                        <div>
-                            <button type="button" class="btn btn-default btn-lg"style="min-width: 7rem;float: left;" (click)="useThisModel(model)" mat-raised-button color="primary">Koristi
-                                <span class="glyphicon glyphicon-search"></span>
-                            </button>
-                            <button (click)="deleteThisModel(model)" mat-raised-button color="warn" style="min-width: 7rem;float: right" ><mat-icon>delete</mat-icon></button>
-                            
-                        
-                        </div>
-                    </div>
-                </div><!-- end panel-footer -->
-
-                
-                
-                </div>
-            </div>
-        <div class="text-center" *ngIf="this.myModels.length == 0" >
-        <h2>Nema rezultata</h2>
-        </div>
-        </div>
-    
-    </div>
-    
-    
-    
-    
-    
-    </div>
diff --git a/frontend/src/app/_pages/my-models/my-models.component.ts b/frontend/src/app/_pages/my-models/my-models.component.ts
deleted file mode 100644
index d379fa69..00000000
--- a/frontend/src/app/_pages/my-models/my-models.component.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
-import shared from 'src/app/Shared';
-import Model from 'src/app/_data/Model';
-import { ModelsService } from 'src/app/_services/models.service';
-
-@Component({
-  selector: 'app-my-models',
-  templateUrl: './my-models.component.html',
-  styleUrls: ['./my-models.component.css']
-})
-export class MyModelsComponent implements OnInit {
-  myModels: Model[] = [];
-  //myModel: Model;
-
-  constructor(private modelsS : ModelsService, private router : Router) {
-
-    
-
-     }
-
-  ngOnInit(): void {
-    this.getAllMyModels();
-
-  }
-/*
-  editModel(): void{
-    this.modelsS.editModel().subscribe(m => {
-      this.myModel = m;
-
-    })
-  }
-*/
-
-deleteThisModel(model: Model): void{
-  shared.openYesNoDialog('Brisanje seta podataka','Da li ste sigurni da želite da obrišete model?',() => {
-  this.modelsS.deleteModel(model).subscribe((response) => {
-    this.getAllMyModels();
-  }, (error) =>{
-      if (error.error == "Model with name = {name} deleted") {
-        shared.openDialog("Obaveštenje", "Greška prilikom brisanja modela.");
-      }
-    });
-  });
-}
-
-
-useThisModel(model: Model): void{
-
-  this.router.navigate(['/training'])
-  
-}
-  getAllMyModels(): void{
-    this.modelsS.getMyModels().subscribe(m => {
-      this.myModels = m;
-    });
-  }
-
-}
diff --git a/frontend/src/app/_pages/my-predictors/my-predictors.component.css b/frontend/src/app/_pages/my-predictors/my-predictors.component.css
deleted file mode 100644
index ccb9fb7b..00000000
--- a/frontend/src/app/_pages/my-predictors/my-predictors.component.css
+++ /dev/null
@@ -1,13 +0,0 @@
-#header {
-    background-color: #003459;
-    padding-top: 20px;
-    padding-bottom: 15px;
-    text-align: center;
-    color: white;
-    border-radius: 5px;
-}
-
-.row{
-    margin-top: 10px;
-    margin-bottom: 30px;
-}
\ No newline at end of file
diff --git a/frontend/src/app/_pages/my-predictors/my-predictors.component.html b/frontend/src/app/_pages/my-predictors/my-predictors.component.html
deleted file mode 100644
index 31fa786c..00000000
--- a/frontend/src/app/_pages/my-predictors/my-predictors.component.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div id="header">
-    <h1>Trenirani modeli</h1>
-</div>
-<div id="wrapper">
-<div id="container" class="container p-5" style="background-color:rgba(255, 255, 255, 0.8); min-height: 100%;">
-    <div class="row mt-3 mb-2 d-flex justify-content-center">
-        
-        <div class="col-sm-6" style="margin-bottom: 10px;">
-        </div>
-        <div class="row">
-            <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let predictor of predictors">
-                <app-item-predictor [predictor]="predictor"></app-item-predictor>
-                <div>
-                    <button (click)="deleteThisPredictor(predictor)" mat-raised-button color="warn" style="min-width: 10rem;float: right" ><mat-icon>delete</mat-icon></button>
-                </div>
-            </div>
-        </div>
-</div>
-</div>
-</div>
-
-
-
diff --git a/frontend/src/app/_pages/my-predictors/my-predictors.component.spec.ts b/frontend/src/app/_pages/my-predictors/my-predictors.component.spec.ts
deleted file mode 100644
index 37dddf6d..00000000
--- a/frontend/src/app/_pages/my-predictors/my-predictors.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MyPredictorsComponent } from './my-predictors.component';
-
-describe('MyPredictorsComponent', () => {
-  let component: MyPredictorsComponent;
-  let fixture: ComponentFixture<MyPredictorsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ MyPredictorsComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MyPredictorsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/frontend/src/app/_pages/my-predictors/my-predictors.component.ts b/frontend/src/app/_pages/my-predictors/my-predictors.component.ts
deleted file mode 100644
index 4dc5300d..00000000
--- a/frontend/src/app/_pages/my-predictors/my-predictors.component.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import Predictor from 'src/app/_data/Predictor';
-import { PredictorsService } from 'src/app/_services/predictors.service';
-import shared from 'src/app/Shared';
-@Component({
-  selector: 'app-my-predictors',
-  templateUrl: './my-predictors.component.html',
-  styleUrls: ['./my-predictors.component.css']
-})
-export class MyPredictorsComponent implements OnInit {
-  predictors: Predictor[] = [];
-  constructor(private predictorsS : PredictorsService) {
-  }
-  ngOnInit(): void {
-    this.predictorsS.getMyPredictors().subscribe((response) => {
-      this.predictors = response;
-    }, (error) => {
-      if (error.error == "Predictor with...") {
-        shared.openDialog("Greska", "Greska");
-      }
-    });
-  }
-
-  deleteThisPredictor(predictor: Predictor): void{
-    shared.openYesNoDialog('Brisanje prediktora','Da li ste sigurni da želite da obrišete prediktor?',() => {
-    this.predictorsS.deletePredictor(predictor).subscribe((response) => {
-      this.getAllMyPredictors();
-    }, (error) =>{
-        if (error.error == "Predictor with name = {name} deleted") {
-          shared.openDialog("Obaveštenje", "Greška prilikom brisanja prediktora.");
-        }
-      });
-    });
-  }
-
-  getAllMyPredictors(): void{
-    this.predictorsS.getMyPredictors().subscribe(p => {
-      this.predictors = p;
-    });
-  }
-
-
-}
diff --git a/frontend/src/app/_pages/predict/predict.component.css b/frontend/src/app/_pages/predict/predict.component.css
deleted file mode 100644
index dab059a5..00000000
--- a/frontend/src/app/_pages/predict/predict.component.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#wrapper {
-    color: #003459;
-}
\ No newline at end of file
diff --git a/frontend/src/app/_pages/predict/predict.component.html b/frontend/src/app/_pages/predict/predict.component.html
deleted file mode 100644
index 13afa8e4..00000000
--- a/frontend/src/app/_pages/predict/predict.component.html
+++ /dev/null
@@ -1,73 +0,0 @@
-
-<div id="wrapper">
-    <br>
-    <div id="container" class="container p-5" style="background-color: white; min-height: 100%;">
-        
-        <div id="header">
-            <h1>Iskoristite prediktor</h1>
-        </div>
-        
-        <br>
-        
-        <div class="form-group row mt-3 mb-2 d-flex justify-content-left">
-            <!--justify-content-center-->
-            <h2> Izabrani prediktor: </h2>
-            <div class="col-10">
-                <label for="output" class="col-sm-5 col-form-label">Naziv prediktora: <b>{{predictor.name}}</b></label>
-            </div>
-            <div>
-                <label for="output" class="col-sm-5 col-form-label">Opis prediktora: <b>{{predictor.description}}</b></label>
-            </div>
-
-            
-        </div>
-    <br>
-        <label for="type" class="form-check-label" ><b>Informacije o prediktoru</b></label>
-        <div class="col-5 mt-2">
-            <label for="type" class="form-check-label"  >Prediktor {{predictor.isPublic?"je":"nije"}} javni.</label>
-        </div>
-        <div class="col-5 mt-2">
-            <label for="type" class="form-check-label" >Prediktor {{predictor.accessibleByLink?"je":"nije"}} dostupan za deljenje.</label>
-        </div>
-        <br>
-        <div class="col-2">
-            <label for="dateCreated" class="col-form-label">Datum:</label> 
-            <input type="text" class="form-control-plaintext" id="dateCreated" placeholder="--/--/--"
-                value="{{predictor.dateCreated | date: 'dd/MM/yyyy'}}" readonly>
-        </div>
-
-
-        <br>
-        <div >
-            <!--input -->
-            <h3>Popunite ulazne kolone:</h3>
-            <div id="divInputs" class="form-check mt-2">
-                <div *ngIf="predictor" class="form-group row mt-3 mb-2 d-flex justify-content-left">
-                    <div *ngFor="let input of predictor.inputs; let i = index">
-                        <label for="{{input}}" class="col-sm-2 col-form-label"><b>{{input}}</b></label>
-                        <input name="{{input}}"  type="text"  [(ngModel)]="inputs[i].value" >
-
-                    </div>
-                    
-                </div>
-            </div>
-           
-            <br>    
-
-        </div>
-        <div>
-            <label for="output" class="col-sm-2 col-form-label">Izlaz: <b>{{predictor.output}}</b></label>
-        </div>
-        
-        <div class="form-group row mt-5 mb-3">
-            <div class="col"></div>
-            <button class="btn btn-lg col-4" style="background-color:#003459; color:white;"
-                (click)="usePredictor();">Iskoristi prediktor</button>
-            <div class="col"></div>
-            
-        </div>
-
-        
-        
-    </div>
-</div>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/predict/predict.component.ts b/frontend/src/app/_pages/predict/predict.component.ts
deleted file mode 100644
index 39dec0ae..00000000
--- a/frontend/src/app/_pages/predict/predict.component.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import Predictor from 'src/app/_data/Predictor';
-import { PredictorsService } from 'src/app/_services/predictors.service';
-import shared from 'src/app/Shared';
-
-@Component({
-  selector: 'app-predict',
-  templateUrl: './predict.component.html',
-  styleUrls: ['./predict.component.css']
-})
-export class PredictComponent implements OnInit {
-
-  inputs : Column[] = [];
-
-
-  predictor:Predictor;
-  constructor(private predictS : PredictorsService, private route: ActivatedRoute) {
-    this.predictor = new Predictor();
-   }
-
-  ngOnInit(): void {
-    this.route.params.subscribe(url => {
-      this.predictS.getPredictor(url["id"]).subscribe(p => {
-      
-        this.predictor = p;
-        this.predictor.inputs.forEach((p,index)=> this.inputs[index] = new Column(p, ""));
-      })
-    });
-  }
-
-  usePredictor(): void{ 
-    this.predictS.usePredictor(this.predictor, this.inputs).subscribe(p => {
-      shared.openDialog("Obaveštenje", "Prediktor je uspešno poslat na probu."); //pisalo je "na treniranje" ??
-    })
-  }
-}
-
-
-export class Column {
-  constructor(
-    public name : string, 
-    public value : (number | string)){
-  }
-}
\ No newline at end of file