Mergovana grana sa granom redesign. Sredjeni konflikti.

1 files changed, 27 insertions, 21 deletions

diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index 36f70c97..48b59dc8 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -1,9 +1,9 @@
 <div id="folder">
     <div id="tabs">
-        <div id="new-file-tab" class="folder-tab p-1 rounded-top" [style]="'z-index:' + (selectedTab == TabType.NewFile ? 11 : 10) + ' ;'" [ngClass]="{'selected-tab' : selectedTab == TabType.NewFile, 'hover-tab' : hoverTab == TabType.NewFile}">
+        <div id="new-file-tab" *ngIf="newFile" class="folder-tab p-1 rounded-top" [style]="'z-index:' + (selectedTab == TabType.NewFile ? 11 : 10) + ' ;'" [ngClass]="{'selected-tab' : selectedTab == TabType.NewFile, 'hover-tab' : hoverTab == TabType.NewFile}">
             <mat-icon class="text-offwhite">add</mat-icon>
             <a class="stretched-link tab-link" (click)="selectTab(TabType.NewFile)" (mouseenter)="hoverOverTab(TabType.NewFile)" (mouseleave)="hoverOverTab(TabType.None)">
-                {{tabTitles[TabType.NewFile]}}
+                {{newFile.name}}
             </a>
         </div>
         <!--<div class="folder-tab p-1 rounded-top" *ngFor="let file of filteredFiles; let i = index" [style]="'z-index:' + calcZIndex(i) + ' ;'" [ngClass]="{'selected-tab' : selectedFileIndex == i, 'hover-tab' : hoveringOverFileIndex == i}">
@@ -12,6 +12,10 @@
         <div class="folder-tab p-1 rounded-top" *ngFor="let tab of tabsToShow; let i = index" [style]="'z-index:' + (selectedTab == tab ? 11 : (tabsToShow.length - i)) + ' ;'" [ngClass]="{'selected-tab' : selectedTab == tab, 'hover-tab' : hoverTab == tab}">
             <a class="m-1 stretched-link tab-link" (click)="selectTab(tab)" (mouseenter)="hoverOverTab(tab)" (mouseleave)="hoverOverTab(TabType.None)">{{tabTitles[tab]}}</a>
         </div>
+
+        <div class="folder-tab p-1 rounded-top" *ngIf="selectedFile" [style]="'z-index:' + (selectedTab == TabType.File ? 11 : (tabsToShow.length)) + ' ;'" [ngClass]="{'selected-tab' : selectedTab == TabType.File, 'hover-tab' : hoverTab == TabType.File}">
+            <a class="m-1 stretched-link tab-link" (click)="selectTab(TabType.File)" (mouseenter)="hoverOverTab(TabType.File)" (mouseleave)="hoverOverTab(TabType.None)">{{selectedFile.name}}</a>
+        </div>
     </div>
     <div id="selected-content" class="rounded-bottom text-offwhite">
         <div id="searchbar" *ngIf="listView">
@@ -26,20 +30,20 @@
                 </mat-form-field>
             </div>
             <div id="search-options">
-                <div id="collapseFilters" class="collapse collapse-horizontal">
+                <!-- <div id="collapseFilters" class="collapse collapse-horizontal">
                     <mat-icon class="text-offwhite ">timeline</mat-icon>
                     Regresioni
                     <mat-icon class="text-offwhite ">looks_two</mat-icon>
                     Binarni klasifikacioni
                     <mat-icon class="text-offwhite ">auto_awesome_motion</mat-icon>
                     Multiklasifikacioni
-                </div>
+                </div> -->
                 <button class="btn-clear icon-toggle" data-bs-toggle="collapse" data-bs-target="#collapseFilters" aria-expanded="false" aria-controls="collapseFilters">
                     <mat-icon>filter_alt</mat-icon>
                 </button>
-                <div id="collapseSort" class="collapse collapse-horizontal">
+                <!-- <div id="collapseSort" class="collapse collapse-horizontal">
                     [sort options here TODO]
-                </div>
+                </div> -->
                 <button class="btn-clear icon-toggle" data-bs-toggle="collapse" data-bs-target="#collapseSort" aria-expanded="false" aria-controls="collapseSort">
                     <mat-icon>sort</mat-icon>
                 </button>
@@ -49,35 +53,37 @@
             </div>
         </div>
         <!--{{fileToDisplay ? fileToDisplay.name : 'No file selected.'}} {{selectedFileIndex}} {{hoveringOverFileIndex}}-->
-        <div [ngSwitch]="listView" class="folder-inside bg-blur">
-            <div class="file-content" [ngSwitch]="type" *ngSwitchCase="false">
-                <div class="file-bottom-buttons">
-                    <button class="btn-clear file-button" (click)="deleteFile()">
+        <div class="folder-inside bg-blur">
+            <div class="file-content" [ngClass]="{'form-hidden' : listView}">
+                <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
+                    <button *ngIf="this.selectedFile && selectedTab == TabType.File" class="btn-clear file-button" (click)="deleteFile(this.selectedFile)">
                         <mat-icon>delete</mat-icon>
                     </button>
-                    <button class="btn-clear file-button">
-                        <mat-icon>link</mat-icon>
-                    </button>
-                    <button class="btn-clear file-button">
+                    <!-- <button class="btn-clear file-button">
                         <mat-icon>zoom_out_map</mat-icon>
-                    </button>
+                    </button> -->
                 </div>
-                <app-form-model [forExperiment]="forExperiment" [model]="fileToDisplay" *ngSwitchCase="FolderType.Model"></app-form-model>
-                <app-form-dataset *ngSwitchCase="FolderType.Dataset" ></app-form-dataset>
+                <app-form-model [ngClass]="{'form-hidden': type != FolderType.Model}"></app-form-model>
+                <app-form-dataset [ngClass]="{'form-hidden': type != FolderType.Dataset}"></app-form-dataset>
             </div>
-            <div *ngSwitchCase="true" class="list-view">
-                <div *ngFor="let file of filteredFiles; let i = index" class="list-item">
+            <div [ngClass]="{'form-hidden' : !listView}" class="list-view">
+                <div *ngFor="let file of filteredFiles; let i = index" class="list-item force-link" (click)="selectFile(file)">
                     <div class="mx-2">
-                        <a class="force-link" (click)="selectFile(i)">{{file.name}}</a>
+                        {{file.name}}
                     </div>
                     <div class="mx-2 hover-hide">
                         {{file.lastUpdated | date}}
                     </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>
+                    <button mat-raised-button *ngSwitchCase="FolderType.Experiment" routerLink="/experiment">Dodaj eksperiment</button>
+                </div>
             </div>
         </div>
     </div>
-    <div id="footer" [ngSwitch]="newFileSelected">
+    <div id="footer" [ngSwitch]="newFileSelected" *ngIf="!listView">
         <button mat-button (click)="saveNewFile()" class="bottom-button text-offwhite rounded-bottom" *ngSwitchCase="true">
             <div  class="f-row">
                 <div>Sačuvaj</div>