Osposobio pretragu u folder komponenti. Promenio experiment stranu tako da moze da se skroluje od koraka do koraka. Dodao nacin da komponente manuelno skroluju pozadinu.

1 files changed, 29 insertions, 30 deletions

diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index 895ac84e..c3da30fc 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -1,12 +1,12 @@
 <div id="folder" style="width: 60rem;">
-    <div id="tabs" class="text-offwhite">
+    <div id="tabs">
         <div id="new-file-tab" class="folder-tab p-1 rounded-top" [style]="'z-index:' + newFileZIndex() + ' ;'" [ngClass]="{'selected-tab' : newFileSelected, 'hover-tab' : hoveringOverFileIndex == -2}">
             <mat-icon class="text-offwhite">add</mat-icon>
             <a class="stretched-link tab-link" (click)="selectNewFile()" (mouseenter)="hoverOverFile(-2)" (mouseleave)="hoverOverFile(-1)">
                 <p class="m-1" *ngIf="newFile != undefined">{{newFile.name}}</p>
             </a>
         </div>
-        <div class="folder-tab p-1 rounded-top" *ngFor="let file of files; let i = index" [style]="'z-index:' + calcZIndex(i) + ' ;'" [ngClass]="{'selected-tab' : selectedFileIndex == i, 'hover-tab' : hoveringOverFileIndex == i}">
+        <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}">
             <a class="m-1 stretched-link tab-link" (click)="selectFile(i)" (mouseenter)="hoverOverFile(i)" (mouseleave)="hoverOverFile(-1)">{{file.name}}</a>
         </div>
     </div>
@@ -15,27 +15,22 @@
             <div id="path" class="ps-2">{{folderName}}
             </div>
             <mat-icon>keyboard_arrow_right</mat-icon>
-            <div id="search">
+            <div id="search" class="text-offwhite">
                 <mat-form-field>
-                    <input matNativeControl>
+                    <button matPrefix class="btn-clear input-icon"><mat-icon>search</mat-icon></button>
+                    <input type="search" matInput name="search" [(ngModel)]="searchTerm" (input)="searchTermsChanged()">
+                    <button matSuffix class="btn-clear input-icon" (click)="clearSearchTerm()"><mat-icon>clear</mat-icon></button>
                 </mat-form-field>
             </div>
             <div id="search-options">
                 <div id="collapseFilters" class="collapse collapse-horizontal">
-                    <mat-chip-list aria-label="filter selection">
-                        <mat-chip class="text-offwhite ns-bg-dark-50">
-                            <mat-icon class="text-offwhite">timeline</mat-icon>
-                            Regresioni
-                        </mat-chip>
-                        <mat-chip class="text-offwhite ns-bg-dark-50">
-                            <mat-icon class="text-offwhite">looks_two</mat-icon>
-                            Binarni klasifikacioni
-                        </mat-chip>
-                        <mat-chip class="text-offwhite ns-bg-dark-50">
-                            <mat-icon class="text-offwhite">auto_awesome_motion</mat-icon>
-                            Multiklasifikacioni
-                        </mat-chip>
-                    </mat-chip-list>
+
+                    <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>
                 <a class="tab-link p-1" data-bs-toggle="collapse" data-bs-target="#collapseFilters" aria-expanded="false" aria-controls="collapseFilters">
                     <mat-icon>filter_alt</mat-icon>
@@ -50,19 +45,23 @@
         </div>
         {{fileToDisplay ? fileToDisplay.name : 'No file selected.'}} {{selectedFileIndex}} {{hoveringOverFileIndex}}
     </div>
-    <div id="footer">
-        <div class="folder-bottom-button text-offwhite rounded-bottom bubble" *ngIf="newFileSelected">
-            <a class="tab-link stretched-link">Sačuvaj</a>
-            <div>
-                <mat-icon>check</mat-icon>
+    <div id="footer" [ngSwitch]="newFileSelected">
+        <button mat-button (click)="saveNewFile()" class="bottom-button text-offwhite rounded-bottom" *ngSwitchCase="true">
+            <div  class="f-row">
+                <div>Sačuvaj</div>
+                <div class="pt-1">
+                    <mat-icon>check</mat-icon>
+                </div>
             </div>
-        </div>
-        <div class="folder-bottom-button text-offwhite rounded-bottom bubble" *ngIf="!newFileSelected">
-            <a class="tab-link stretched-link">Ok</a>
-            <div class="icon-double">
-                <mat-icon>check</mat-icon>
-                <mat-icon>check</mat-icon>
+        </button>
+        <button mat-button (click)="ok()" class="bottom-button text-offwhite rounded-bottom" *ngSwitchCase="false">
+            <div class="f-row">
+                <div>Ok</div>
+                <div class="icon-double pt-1">
+                    <mat-icon>check</mat-icon>
+                    <mat-icon>check</mat-icon>
+                </div>
             </div>
-        </div>
+        </button>
     </div>
 </div>
\ No newline at end of file