From e7fd69e652566232dad8631a9c95532c033eaf96 Mon Sep 17 00:00:00 2001
From: "DESKTOP-S0O2C44\\ROG" <ivan996sk@gmail.com>
Date: Thu, 31 Mar 2022 14:22:55 +0200
Subject: Doradjen dizajn stranica modeli i prediktor #53 #66

---
 .../_elements/annvisual/annvisual.component.html   |  4 ++--
 .../_elements/item-model/item-model.component.html |  6 +++---
 .../app/_pages/my-models/my-models.component.html  | 22 ++++++++++++++++------
 .../src/app/_pages/predict/predict.component.css   |  3 +++
 .../src/app/_pages/predict/predict.component.html  |  7 ++-----
 .../src/app/_pages/predict/predict.component.ts    |  2 +-
 6 files changed, 27 insertions(+), 17 deletions(-)

(limited to 'frontend')

diff --git a/frontend/src/app/_elements/annvisual/annvisual.component.html b/frontend/src/app/_elements/annvisual/annvisual.component.html
index f23022de..09251398 100644
--- a/frontend/src/app/_elements/annvisual/annvisual.component.html
+++ b/frontend/src/app/_elements/annvisual/annvisual.component.html
@@ -1,5 +1,5 @@
-<div style="text-align: center; width: 100%;" >
+<div style="text-align: center; " >
     <button (click)="d3()" mat-raised-button color="primary">Prikaz veštačke neuronske mreže</button>
-    <div id="graph" align-items-center ></div>
+    <div id="graph" align-items-center style="width: 12rem;"></div>
   </div>
 
diff --git a/frontend/src/app/_elements/item-model/item-model.component.html b/frontend/src/app/_elements/item-model/item-model.component.html
index 9466da01..c8c1a36d 100644
--- a/frontend/src/app/_elements/item-model/item-model.component.html
+++ b/frontend/src/app/_elements/item-model/item-model.component.html
@@ -6,9 +6,9 @@
     <div class="card-body overflow-hidden">
         <p class="card-text">
             {{"Opis: "+ model.description}}<br>
-            {{"Datum kreiranja:" + model.dateCreated}}<br>
-            {{"Poslednje ažuriranje:" + model.lastUpdated}}<br>
+            {{"Datum kreiranja: " + model.dateCreated}}<br>
+            {{"Poslednje ažuriranje: " + model.lastUpdated}}<br>
         </p>
-        
+        <app-annvisual class="align-items-center"  [model]="model" style="width: 12rem"></app-annvisual>
     </div>
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/my-models/my-models.component.html b/frontend/src/app/_pages/my-models/my-models.component.html
index e2533d89..ec6c83d5 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.html
+++ b/frontend/src/app/_pages/my-models/my-models.component.html
@@ -8,12 +8,22 @@
             <div class="row">
                 <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let model of myModels">
                 <app-item-model [model]="model"></app-item-model>
-                <app-annvisual align-items-center [model]="model" style="width: 100%;"></app-annvisual>
-                <div style="width: 25%; margin: auto;">
-                    <button mat-raised-button color="primary" (click)="deleteThisModel(model)" style="margin-top: 3px; width: 100%;">Obriši</button>
-                    
-                    <button mat-raised-button color="primary" (click)="deleteThisModel(model)" style="margin-top: 3px; width: 100%;">Koristi</button>
-                </div>
+                
+                <div class="panel-footer row"><!-- panel-footer -->
+                    <div class="col-xs-6 text-center">
+                        <div>
+                          <button type="button" class="btn btn-default btn-lg" (click)="deleteThisModel(model)" mat-raised-button color="primary">Koristi
+                              <span class="glyphicon glyphicon-chevron-left"></span>
+                          </button>
+                          <button type="button" class="btn btn-default btn-lg" mat-raised-button color="primary" (click)="deleteThisModel(model)">Obriši
+                            <span class="glyphicon glyphicon-chevron-right"></span>
+                        </button>
+                        </div>
+                    </div>
+                </div><!-- end panel-footer -->
+
+                
+                
                 </div>
             </div>
         <div class="text-center" *ngIf="this.myModels.length == 0" >
diff --git a/frontend/src/app/_pages/predict/predict.component.css b/frontend/src/app/_pages/predict/predict.component.css
index e69de29b..dab059a5 100644
--- a/frontend/src/app/_pages/predict/predict.component.css
+++ b/frontend/src/app/_pages/predict/predict.component.css
@@ -0,0 +1,3 @@
+#wrapper {
+    color: #003459;
+}
\ No newline at end of file
diff --git a/frontend/src/app/_pages/predict/predict.component.html b/frontend/src/app/_pages/predict/predict.component.html
index fe17c96d..bf4d9a1e 100644
--- a/frontend/src/app/_pages/predict/predict.component.html
+++ b/frontend/src/app/_pages/predict/predict.component.html
@@ -35,7 +35,7 @@
                 </div>
             </div>
            
-            
+            <br>    
 
         </div>
         <div>
@@ -43,14 +43,11 @@
         </div>
         <br>
         <br>
-        <br>
-        <br>
-        <br>
 
         <div class="col-5 mt-2">
             <label for="type" class="form-check-label">Da li je prediktor javan?</label>
             <input class="mx-3 form-check-input" type="checkbox" [(ngModel)]="predictor.isPublic"
-                type="checkbox" value="" >
+                type="checkbox" value="">
         </div>
         <div class="col-5 mt-2">
             <label for="type" class="form-check-label">Da li je dostupan za deljenje?</label>
diff --git a/frontend/src/app/_pages/predict/predict.component.ts b/frontend/src/app/_pages/predict/predict.component.ts
index 3f431fff..71cf93ce 100644
--- a/frontend/src/app/_pages/predict/predict.component.ts
+++ b/frontend/src/app/_pages/predict/predict.component.ts
@@ -30,7 +30,7 @@ export class PredictComponent implements OnInit {
   usePredictor(): void{ 
     this.predictS.usePredictor(this.predictor, this.inputs).subscribe(p => {
       
-      alert("Uspesno ste poslali preditor!");
+      alert("Prediktor je uspesno poslat na treniranje!");
     })
     console.log(this.inputs);
   }
-- 
cgit v1.2.3