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

# Conflicts:
#	frontend/package-lock.json
#	frontend/src/app/_elements/folder/folder.component.html
#	frontend/src/app/_elements/form-dataset/form-dataset.component.html
#	frontend/src/app/_pages/experiment/experiment.component.html

1 files changed, 9 insertions, 1 deletions

diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index c97a01b6..e0336ded 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -3,7 +3,7 @@ import Dataset from 'src/app/_data/Dataset';
 import { FolderFile, FolderType } from 'src/app/_data/FolderFile';
 import Model from 'src/app/_data/Model';
 import { DatasetsService } from 'src/app/_services/datasets.service';
-import shared from 'src/app/Shared';
+import Shared from 'src/app/Shared';
 import { ModelsService } from 'src/app/_services/models.service';
 import { FormDatasetComponent } from '../form-dataset/form-dataset.component';
 import Experiment from 'src/app/_data/Experiment';
@@ -19,6 +19,9 @@ export class FolderComponent implements AfterViewInit {
 
   @ViewChild(FormDatasetComponent) formDataset?: FormDatasetComponent;
 
+ 
+
+
   @Input() folderName: string = 'Moji podaci';
   @Input() files!: FolderFile[]
 
@@ -118,6 +121,10 @@ export class FolderComponent implements AfterViewInit {
       this.folders[TabType.MyDatasets] = datasets;
     });
 
+    this.experimentsService.getMyExperiments().subscribe((experiments) => {
+      this.folders[TabType.MyExperiments] = experiments;
+    });
+
     this.datasetsService.getPublicDatasets().subscribe((datasets) => {
       this.folders[TabType.PublicDatasets] = datasets;
     });
@@ -148,6 +155,7 @@ export class FolderComponent implements AfterViewInit {
       this.formDataset!.uploadDataset();
   }
 
+
   /*calcZIndex(i: number) {
     let zIndex = (this.files.length - i - 1)
     if (this.selectedFileIndex == i)