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

8 files changed, 16 insertions, 6 deletions

diff --git a/frontend/src/app/_elements/datatable/datatable.component.css b/frontend/src/app/_elements/datatable/datatable.component.css
index e69de29b..4e0a3737 100644
--- a/frontend/src/app/_elements/datatable/datatable.component.css
+++ b/frontend/src/app/_elements/datatable/datatable.component.css
@@ -0,0 +1,4 @@
+.proba {
+    max-width: 1620px;
+    
+}
\ No newline at end of file
diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css
index 97c13299..682fc645 100644
--- a/frontend/src/app/_elements/folder/folder.component.css
+++ b/frontend/src/app/_elements/folder/folder.component.css
@@ -1,5 +1,6 @@
 #folder {
     width: 100%;
+    
 }
 
 #tabs {
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index da182945..66a3ab55 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -116,9 +116,10 @@
                     </div>
 
                 </div>
-                <div class="list-add" [ngSwitch]="type">
-                    <button mat-raised-button *ngSwitchCase="FolderType.Dataset" (click)="selectNewFile()">Dodaj {{privacy == Privacy.Public ? 'javni ' : ' '}}izvor podataka</button>
-                    <button mat-raised-button *ngSwitchCase="FolderType.Model" (click)="selectNewFile()">Dodaj {{privacy == Privacy.Public ? 'javnu ' : ' '}}konfiguraciju neuronske mreže</button>
+                <div class="list-add" [ngSwitch]="type" *ngIf="privacy != Privacy.Public" >
+                    <!-- {{privacy == Privacy.Public ? 'javni ' : ' '}} -->
+                    <button mat-raised-button *ngSwitchCase="FolderType.Dataset" (click)="selectNewFile()">Dodaj izvor podataka</button>
+                    <button mat-raised-button *ngSwitchCase="FolderType.Model" (click)="selectNewFile()">Dodaj konfiguraciju neuronske mreže</button>
                     <button mat-raised-button *ngSwitchCase="FolderType.Experiment" routerLink="/experiment">Dodaj eksperiment</button>
                 </div>
             </div>
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index ed38bbd6..93e8ba98 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -467,6 +467,7 @@ export class FolderComponent implements AfterViewInit {
     setTimeout(() => {
       if (tab == TabType.NewFile) {
         this.selectNewFile();
+        this.selectedFile=undefined!;
       }
 
       this.listView = this.getListView(tab);
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.css b/frontend/src/app/_elements/form-dataset/form-dataset.component.css
index 99ed5d40..43accd6d 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.css
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.css
@@ -7,7 +7,7 @@
 .topBar {
     display: table;
     width: 100%;
-    height: 100px;
+    height: 80px;
     margin-left: 1.5%; 
     margin-top: 1.5% ;
 }
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html
index 024f58e8..6194a1a8 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html
@@ -40,7 +40,7 @@
 
             <input class="file" id="file-upload" (change)="changeListener($event)" (valueChange)="dataset.isPreProcess = false; editEvent.emit()" #fileInput type="file" accept=".csv">
 
-            <div class="mt-5 datatable">
+            <div class="datatable">
                 <div [ngClass]="{'hidden': (!existingFlag)}" class="text-center">
                     <button mat-button (click)="goBack()"><mat-icon>keyboard_arrow_left</mat-icon></button>
                     <div style="display: inline;">{{(this.begin/10)+1}}...{{getPage()}}</div>
diff --git a/frontend/src/app/_pages/archive/archive.component.css b/frontend/src/app/_pages/archive/archive.component.css
index e69de29b..3a8145dc 100644
--- a/frontend/src/app/_pages/archive/archive.component.css
+++ b/frontend/src/app/_pages/archive/archive.component.css
@@ -0,0 +1,3 @@
+.pro-center{
+    width: 80%;
+}
\ No newline at end of file
diff --git a/frontend/src/app/_pages/archive/archive.component.html b/frontend/src/app/_pages/archive/archive.component.html
index f9cce56b..0c5fa8aa 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 [archive]="true" [startingTab]="TabType.MyExperiments"></app-folder>
+    <app-folder [archive]="true" [startingTab]="TabType.MyExperiments" class="pro-center"></app-folder>
 
     <!--<div class="my-5" style="height: fit-content;">
         <app-playlist [datasets]="publicDatasets"></app-playlist>