From 743646bb658911b0d89fa08815fbc3872e4223a0 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Mon, 16 May 2022 17:57:01 +0200
Subject: Form-model: stopa ucenja postavljena na 0.01 difoltno. Home-page:
 izmenjeni neki fontovi i velicina, tekst vise ne izgleda kao link.

---
 frontend/src/app/_data/Model.ts                    |  2 +-
 .../_elements/form-model/form-model.component.html |  6 +-
 .../_pages/experiment/experiment.component.html    | 82 +++++++++++-----------
 frontend/src/app/_pages/home/home.component.css    | 10 +++
 frontend/src/app/_pages/home/home.component.html   |  8 +--
 5 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts
index 05d17e01..8fc36a31 100644
--- a/frontend/src/app/_data/Model.ts
+++ b/frontend/src/app/_data/Model.ts
@@ -21,7 +21,7 @@ export default class Model extends FolderFile {
         public metrics: string[] = [], // TODO add to add-model form
         public epochs: number = 5, // TODO add to add-model form
         public inputColNum: number = 5,
-        public learningRate: LearningRate = LearningRate.LR1,
+        public learningRate: LearningRate = LearningRate.LR3,
         public layers: Layer[] = [new Layer()],
 
         // Test set settings
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 1db6195b..97e38cf1 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.html
+++ b/frontend/src/app/_elements/form-model/form-model.component.html
@@ -11,12 +11,12 @@
             <div class="ns-col">
                 <mat-form-field appearance="fill" class="mat-fix">
                     <mat-label>Tip problema</mat-label>
-                    <mat-select [(ngModel)]="newModel.type"  (selectionChange)="filterLossFunction()" *ngIf="this.hideProblemType" disabled="true">
+                    <mat-select [(ngModel)]="newModel.type" (selectionChange)="filterLossFunction()" *ngIf="this.hideProblemType" disabled="true">
                         <mat-option *ngFor="let option of Object.keys(ProblemType); let optionName of Object.values(ProblemType)" [value]="option">
                             {{ optionName }}
                         </mat-option>
                     </mat-select>
-                    <mat-select [(ngModel)]="newModel.type"  (selectionChange)="filterLossFunction()" *ngIf="!this.hideProblemType" disabled="false">
+                    <mat-select [(ngModel)]="newModel.type" (selectionChange)="filterLossFunction()" *ngIf="!this.hideProblemType" disabled="false">
                         <mat-option *ngFor="let option of Object.keys(ProblemType); let optionName of Object.values(ProblemType)" [value]="option">
                             {{ optionName }}
                         </mat-option>
@@ -102,7 +102,7 @@
                     <div class="text-center pt-0 mt-0 p-0">Trening
                         <mat-slider min="10" max="90" step="5" [(ngModel)]="testSetDistribution" (input)="updateTestSet($event)"></mat-slider>
                         Test</div>
-                </div>             
+                </div>
                 <div class="row p-0" style="margin-left: 10px;margin-bottom: 0; padding: 0;">
                     <mat-checkbox color="accent">Nasumični redosled podataka</mat-checkbox>
                 </div>
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html
index 4c9d0222..20ff33d1 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.html
+++ b/frontend/src/app/_pages/experiment/experiment.component.html
@@ -1,47 +1,47 @@
 <div class="container-fluid p-0 text-offwhite holder" style="height: calc(100vh - 64px); text-align: center;">
     <div class="d-flex flex-colum align-items-center sidenav">
         <div>
-        <div class="ekspName " style="width: 250px;">
-            <div class="text-overflow" *ngIf="experiment.name=='exp1'" style="width: 250px;">
-                Novi Eksperiment
-            </div>
-            <div class="text-overflow" *ngIf="experiment.name!='exp1'" style="width: 250px;">
-                {{experiment.name}}
-            </div>
+            <div class="ekspName " style="width: 250px;">
+                <div class="text-overflow" *ngIf="experiment.name=='exp1'" style="width: 250px;">
+                    Novi Eksperiment
+                </div>
+                <div class="text-overflow" *ngIf="experiment.name!='exp1'" style="width: 250px;">
+                    {{experiment.name}}
+                </div>
 
-        </div>
-        <mat-stepper orientation="vertical" (selectionChange)="changePage($event)">
-            <mat-step>
-                <!--editable="false"-->
-                <ng-template matStepLabel>
-                    <span class="label" *ngIf="dataset==undefined">Izvor podataka</span>
-                    <span class="label addedElement" *ngIf="dataset!=undefined">{{dataset.name}}</span>
-                </ng-template>
-                <ng-template matStepContent>
-                    <p class="text-left">Izaberite vas izvor podataka</p>
-                </ng-template>
-            </mat-step>
-            <mat-step>
-                <ng-template matStepLabel>
-                    <span class="label addedElement" *ngIf="experiment.name!='exp1'">Predvideti:{{experiment.outputColumn}}</span>
-                    <span class="label" *ngIf="experiment.name=='exp1'">Odabir kolona</span>
-                </ng-template>
-                <ng-template matStepContent>
-                    <p class="text-left">Pripremite podatke i izaberite izlazne kolone</p>
-                </ng-template>
-            </mat-step>
-            <mat-step>
-                <ng-template matStepLabel>
-                    <span class="label addedElement" *ngIf="modelToTrain!=undefined">{{modelToTrain.name}}</span>
-                    <span class="label" *ngIf="modelToTrain==undefined">Treniranje</span>
-                </ng-template>
-                <p class="text-left">Odaberite parametre i trenirajte model</p>
-            </mat-step>
-            <mat-step>
-                <ng-template matStepLabel><span class="label">Pregled rezultata<br> treniranja</span></ng-template>
-                <p class="text-left">Pregledajte tok treniranja i<br> grafički prikaz rezultata</p>
-            </mat-step>
-        </mat-stepper>
+            </div>
+            <mat-stepper orientation="vertical" (selectionChange)="changePage($event)">
+                <mat-step>
+                    <!--editable="false"-->
+                    <ng-template matStepLabel>
+                        <span class="label" *ngIf="dataset==undefined">Izvor podataka</span>
+                        <span class="label addedElement" *ngIf="dataset!=undefined">{{dataset.name}}</span>
+                    </ng-template>
+                    <ng-template matStepContent>
+                        <p class="text-left">Izaberite izvor podataka</p>
+                    </ng-template>
+                </mat-step>
+                <mat-step>
+                    <ng-template matStepLabel>
+                        <span class="label addedElement" *ngIf="experiment.name!='exp1'">Predvideti:{{experiment.outputColumn}}</span>
+                        <span class="label" *ngIf="experiment.name=='exp1'">Odabir kolona</span>
+                    </ng-template>
+                    <ng-template matStepContent>
+                        <p class="text-left">Pripremite podatke i izaberite izlazne kolone</p>
+                    </ng-template>
+                </mat-step>
+                <mat-step>
+                    <ng-template matStepLabel>
+                        <span class="label addedElement" *ngIf="modelToTrain!=undefined">{{modelToTrain.name}}</span>
+                        <span class="label" *ngIf="modelToTrain==undefined">Treniranje</span>
+                    </ng-template>
+                    <p class="text-left">Odaberite parametre i trenirajte model</p>
+                </mat-step>
+                <mat-step>
+                    <ng-template matStepLabel><span class="label">Pregled rezultata<br> treniranja</span></ng-template>
+                    <p class="text-left">Pregledajte tok treniranja i<br> grafički prikaz rezultata</p>
+                </mat-step>
+            </mat-stepper>
         </div>
     </div>
     <div #stepsContainer class="steps-container">
@@ -66,4 +66,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/home/home.component.css b/frontend/src/app/_pages/home/home.component.css
index 906f5728..51f22320 100644
--- a/frontend/src/app/_pages/home/home.component.css
+++ b/frontend/src/app/_pages/home/home.component.css
@@ -11,10 +11,20 @@ h1 {
     font-weight: 900 !important;
     margin-top: 1rem;
     margin-bottom: 2.5rem;
+    font-family: /*'Garamond',*/
+    'Courier New', Courier, monospace;
 }
 
 .card {
     margin: 2.5rem !important;
     padding: 1.5rem;
     width: 26rem !important;
+}
+
+a {
+    text-decoration: none;
+}
+
+.subtitle-class {
+    letter-spacing: 0.2rem;
 }
\ No newline at end of file
diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html
index 2825b3bf..9b559bc9 100644
--- a/frontend/src/app/_pages/home/home.component.html
+++ b/frontend/src/app/_pages/home/home.component.html
@@ -11,9 +11,9 @@
         <div class="card shadowed bg-light text-light col-3 m-3" style="width: 18rem;">
             <div class="card-body">
                 <mat-icon width="48px" height="48px" style="font-size: 48px; margin-left: 50%; transform: translateX(-100%);">model_training</mat-icon>
-                <h3 class="card-title my-2">Experimentiši</h3>
+                <h2 class="card-title my-2 subtitle-class">Eksperimentiši</h2>
                 <p class="card-text">
-                    U tri koraka <a class="stretched-link" routerLink="experiment">napravite novu neuronsku mrežu</a>. Koristite postojeće izvore podataka, modele, itd.
+                    U tri koraka <a class="stretched-link text-light" routerLink="experiment">napravite novu neuronsku mrežu</a>. Koristite postojeće izvore podataka, modele, itd.
                 </p>
             </div>
         </div>
@@ -21,9 +21,9 @@
             <div class="card-body">
                 <mat-icon width="48px" height="48px" style="font-size: 48px; margin-left: 50%; transform: translateX(-100%);">storage
                 </mat-icon>
-                <h3 class="card-title my-2">Arhiva</h3>
+                <h2 class="card-title my-2 subtitle-class">Arhiva</h2>
                 <p class="card-text">
-                    <a class="stretched-link" routerLink="archive">Upravljajte</a> izvorima podataka, eksperimentima, modelima, i rezultatima treniranja. Pogledajte podatke koje su podelili drugi korisnici.
+                    <a class="stretched-link text-light" routerLink="archive">Upravljajte</a> izvorima podataka, eksperimentima, modelima i rezultatima treniranja. Pogledajte podatke koje su podelili drugi korisnici.
                 </p>
             </div>
         </div>
-- 
cgit v1.2.3