From 1b9e3a2470d1123b362ad47725bd76b2eb7b39eb Mon Sep 17 00:00:00 2001
From: Danijel Anđelković <adanijel99@gmail.com>
Date: Thu, 28 Apr 2022 22:09:08 +0200
Subject: Dodatne stranice i komponente tako da su vise u skladu sa novom temom
 (navbar, home, archive).

---
 .../_elements/form-model/form-model.component.css  | 18 ++++++++----
 .../_elements/form-model/form-model.component.html | 34 ++++++++++------------
 2 files changed, 28 insertions(+), 24 deletions(-)

(limited to 'frontend/src/app/_elements/form-model')

diff --git a/frontend/src/app/_elements/form-model/form-model.component.css b/frontend/src/app/_elements/form-model/form-model.component.css
index 5776085f..8c279523 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.css
+++ b/frontend/src/app/_elements/form-model/form-model.component.css
@@ -21,7 +21,6 @@ mat-form-field {
 hr {
     color: var(--offwhite) !important;
     margin-bottom: 30px;
-    
 }
 
 .neuron {
@@ -33,16 +32,14 @@ hr {
     background-color: var(--ns-bg-dark-100) !important;
     min-width: none;
     max-width: 12.5rem;
-
 }
 
-
 .row {
     margin: 0;
     padding: 0;
 }
 
-::ng-deep .mat-form-field-wrapper {
+.mat-fix ::ng-deep .mat-form-field-wrapper {
     margin-bottom: -1.85em;
 }
 
@@ -70,12 +67,21 @@ hr {
     margin: 5px;
     padding: 0px;
     width: 12rem;
-    height: 13.5rem;
+    height: 11.1rem;
+}
+
+.tm {
+    margin-left: 10px;
+}
+
+.layer>* {
+    margin-top: 0;
 }
 
 .layer>mat-form-field {
     margin-left: 0;
 }
-.m-2{
+
+.m-2 {
     max-height: 20 rem;
 }
\ No newline at end of file
diff --git a/frontend/src/app/_elements/form-model/form-model.component.html b/frontend/src/app/_elements/form-model/form-model.component.html
index 2139a1c0..f11b609d 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.html
+++ b/frontend/src/app/_elements/form-model/form-model.component.html
@@ -2,13 +2,13 @@
     <div class="ns-row">
 
         <div class="ns-col">
-            <mat-form-field class="example-full-width" appearance="fill">
+            <mat-form-field class="example-full-width" appearance="fill" class="mat-fix">
                 <mat-label>Naziv</mat-label>
                 <input type="text" matInput [(ngModel)]="newModel.name">
             </mat-form-field>
         </div>
         <div class="ns-col">
-            <mat-form-field appearance="fill">
+            <mat-form-field appearance="fill" class="mat-fix">
                 <mat-label>Tip problema</mat-label>
                 <mat-select [(ngModel)]="newModel.type">
                     <mat-option *ngFor="let option of Object.keys(ProblemType); let optionName of Object.values(ProblemType)" [value]="option">
@@ -21,7 +21,7 @@
         <div class="break-1"></div>
 
         <div class="ns-col">
-            <mat-form-field appearance="fill">
+            <mat-form-field appearance="fill" class="mat-fix">
                 <mat-label>Optimizacija</mat-label>
                 <mat-select [(ngModel)]="newModel.optimizer">
                     <mat-option *ngFor="let option of Object.keys(Optimizer); let optionName of Object.values(Optimizer)" [value]="option">
@@ -32,21 +32,20 @@
             </mat-form-field>
         </div>
         <div class="ns-col">
-            <mat-form-field appearance="fill">
+            <mat-form-field appearance="fill" class="mat-fix">
                 <mat-label>Funkcija troška</mat-label>
                 <mat-select [(ngModel)]="newModel.lossFunction">
                     <mat-option *ngFor="let option of Object.keys(LossFunction); let optionName of Object.values(LossFunction)" [value]="option">
                         {{ optionName }}
                     </mat-option>
                 </mat-select>
-
             </mat-form-field>
         </div>
 
         <div class="break-2"></div>
 
         <div class="ns-col">
-            <mat-form-field appearance="fill">
+            <mat-form-field appearance="fill" class="mat-fix">
                 <mat-label>Funkcija aktivacije izlaznog sloja</mat-label>
                 <mat-select name="outputLayerActivationFunction" [(ngModel)]="newModel.outputLayerActivationFunction">
                     <mat-option *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)" [value]="option">
@@ -56,7 +55,7 @@
             </mat-form-field>
         </div>
         <div class="ns-col">
-            <mat-form-field appearance="fill">
+            <mat-form-field appearance="fill" class="mat-fix">
                 <mat-label>Stopa učenja</mat-label>
                 <mat-select [(ngModel)]="newModel.learningRate">
                     <mat-option *ngFor="let option of Object.keys(LearningRate); let optionName of Object.values(LearningRate)" [value]="option">
@@ -69,13 +68,13 @@
         <div class="break-1"></div>
 
         <div class="ns-col">
-            <mat-form-field appearance="fill">
+            <mat-form-field appearance="fill" class="mat-fix">
                 <mat-label>Broj epoha</mat-label>
                 <input type="number" matInput [(ngModel)]="newModel.epochs" min="1" max="1000">
             </mat-form-field>
         </div>
         <div class="ns-col">
-            <mat-form-field appearance="fill">
+            <mat-form-field appearance="fill" class="mat-fix">
                 <mat-label>Broj uzoraka po iteraciji</mat-label>
 
                 <mat-select matNativeControl required [(value)]="newModel.batchSize">
@@ -108,7 +107,7 @@
     </div>
     <div class="break-1"></div>
     <div class="ns-col">
-        <mat-form-field appearance="fill">
+        <mat-form-field appearance="fill" class="mat-fix">
             <mat-label>Aktivaciona funkcija svih slojeva</mat-label>
 
             <mat-select [(ngModel)]="selectedActivation" (selectionChange)="changeAllActivation()">
@@ -120,14 +119,14 @@
     </div>
 
     <div class="ns-col">
-        <mat-form-field appearance="fill">
+        <mat-form-field appearance="fill" class="mat-fix">
             <mat-label>Broj Neurona svih slojeva</mat-label>
             <input matInput type="number" [(ngModel)]="selectedNumberOfNeurons" (change)="changeAllNumberOfNeurons()">
         </mat-form-field>
     </div>
     <div class="break-2"></div>
     <div class="ns-col">
-        <mat-form-field appearance="fill">
+        <mat-form-field appearance="fill" class="mat-fix">
             <mat-label>Regularizacija svih slojeva</mat-label>
             <mat-select [(ngModel)]="selectedRegularisation" (selectionChange)="changeAllRegularisation()">
                 <mat-option *ngFor="let option of Object.keys(Regularisation); let optionName of Object.values(Regularisation)" [value]="option">
@@ -138,7 +137,7 @@
     </div>
 
     <div class="ns-col">
-        <mat-form-field appearance="fill">
+        <mat-form-field appearance="fill" class="mat-fix">
             <mat-label>Stopa regularizacije svih slojeva</mat-label>
             <mat-select [(ngModel)]="selectedRegularisationRate" (selectionChange)="changeAllRegularisationRate()">
                 <mat-option *ngFor="let option of Object.keys(RegularisationRate); let optionName of Object.values(RegularisationRate)" [value]="option">
@@ -152,13 +151,12 @@
 </div>
 
 <!--kraj selectall**********************************************************************************-->
-<hr>
 <div id="layers">
 
     <div class="layer" *ngFor="let item of newModel.layers; let i=index">
 
 
-        <mat-form-field appearance="fill">
+        <mat-form-field appearance="fill" class="mat-fix">
             <mat-label>Aktivacija</mat-label>
             <button matPrefix class="btn-clear center-center text-offwhite">        
                 <div>
@@ -172,7 +170,7 @@
             </mat-select>
         </mat-form-field>
 
-        <div class="d-flex flex-row align-items-center justify-content-center m-1">
+        <div class="d-flex flex-row align-items-center justify-content-center tm">
             <div class="col-6" style="font-size: 13px;">Broj čvorova</div>
             <button class="btn-clear btn-icon" (click)="addNeuron(i)">
                 <mat-icon>add</mat-icon>
@@ -183,7 +181,7 @@
             </button>
         </div>
 
-        <mat-form-field appearance="fill">
+        <mat-form-field appearance="fill" class="mat-fix">
             <mat-label>Regularizacija</mat-label>
             <mat-select [(ngModel)]="newModel.layers[i].regularisation">
                 <mat-option *ngFor="let option of Object.keys(Regularisation); let optionName of Object.values(Regularisation)" [value]="option">
@@ -192,7 +190,7 @@
             </mat-select>
         </mat-form-field>
 
-        <mat-form-field appearance="fill">
+        <mat-form-field appearance="fill" class="mat-fix">
             <mat-label>Stopa regularizacije</mat-label>
             <mat-select [(ngModel)]="newModel.layers[i].regularisationRate">
                 <mat-option *ngFor="let option of Object.keys(RegularisationRate); let optionName of Object.values(RegularisationRate)" [value]="option">
-- 
cgit v1.2.3