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

7 files changed, 3 insertions, 90 deletions

diff --git a/frontend/src/app/_pages/archive/archive.component.html b/frontend/src/app/_pages/archive/archive.component.html
index fc3c4763..f9cce56b 100644
--- a/frontend/src/app/_pages/archive/archive.component.html
+++ b/frontend/src/app/_pages/archive/archive.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex flex-column align-items-center my-5">
-    <app-folder></app-folder>
+    <app-folder [archive]="true" [startingTab]="TabType.MyExperiments"></app-folder>
 
     <!--<div class="my-5" style="height: fit-content;">
         <app-playlist [datasets]="publicDatasets"></app-playlist>
diff --git a/frontend/src/app/_pages/archive/archive.component.ts b/frontend/src/app/_pages/archive/archive.component.ts
index 47f96218..bb4bd9e9 100644
--- a/frontend/src/app/_pages/archive/archive.component.ts
+++ b/frontend/src/app/_pages/archive/archive.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import Dataset from 'src/app/_data/Dataset';
+import { TabType } from 'src/app/_elements/folder/folder.component';
 import { DatasetsService } from 'src/app/_services/datasets.service';
 
 @Component({
@@ -10,6 +11,7 @@ import { DatasetsService } from 'src/app/_services/datasets.service';
 export class ArchiveComponent implements OnInit {
 
   publicDatasets: Dataset[] = [];
+  TabType = TabType;
 
   constructor(private datasetsService: DatasetsService) { }
 
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/settings/settings.component.css b/frontend/src/app/_pages/settings/settings.component.css
deleted file mode 100644
index e69de29b..00000000
--- a/frontend/src/app/_pages/settings/settings.component.css
+++ /dev/null
diff --git a/frontend/src/app/_pages/settings/settings.component.html b/frontend/src/app/_pages/settings/settings.component.html
deleted file mode 100644
index 4ab2a415..00000000
--- a/frontend/src/app/_pages/settings/settings.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>settings works!</p>
diff --git a/frontend/src/app/_pages/settings/settings.component.spec.ts b/frontend/src/app/_pages/settings/settings.component.spec.ts
deleted file mode 100644
index a3a508b0..00000000
--- a/frontend/src/app/_pages/settings/settings.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SettingsComponent } from './settings.component';
-
-describe('SettingsComponent', () => {
-  let component: SettingsComponent;
-  let fixture: ComponentFixture<SettingsComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ SettingsComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SettingsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
diff --git a/frontend/src/app/_pages/settings/settings.component.ts b/frontend/src/app/_pages/settings/settings.component.ts
deleted file mode 100644
index 19862fb0..00000000
--- a/frontend/src/app/_pages/settings/settings.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-settings',
-  templateUrl: './settings.component.html',
-  styleUrls: ['./settings.component.css']
-})
-export class SettingsComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit(): void {
-  }
-
-}