Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

2 files changed, 65 insertions, 2 deletions

diff --git a/frontend/src/app/_pages/predict/predict.component.html b/frontend/src/app/_pages/predict/predict.component.html
index 74a83b71..67d047b7 100644
--- a/frontend/src/app/_pages/predict/predict.component.html
+++ b/frontend/src/app/_pages/predict/predict.component.html
@@ -1 +1,60 @@
-<p>predict works!</p>
+
+<div id="wrapper">
+    <br>
+    <div id="container" class="container p-5" style="background-color: white; min-height: 100%;">
+        
+        <div id="header">
+            <h1>Iskoristite prediktor</h1>
+        </div>
+        
+        <br>
+        
+        <div class="form-group row mt-3 mb-2 d-flex justify-content-center">
+            <!--justify-content-center-->
+            <h2> Izabrani prediktor: </h2>
+            <div class="col-3">
+                <label for="name" class="col-form-label">Naziv prediktora:</label>
+                <input type="text" class="form-control" name="name" [(ngModel)]="predictor.name">
+            </div>
+            <div class="col-5">
+                <label for="desc" class="col-sm-2 col-form-label">Opis:</label>
+                <div>
+                    <textarea class="form-control" name="desc" rows="3" [(ngModel)]="predictor.description"></textarea>
+                </div>
+            </div>
+        </div>
+
+        
+
+        <div class="col-3 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="" >
+        </div>
+        <div class="col-3 mt-2">
+            <label for="type" class="form-check-label">Da li je dostupan za deljenje?</label>
+            <input class="mx-3 form-check-input" type="checkbox" [(ngModel)]="predictor.accessibleByLink"
+                type="checkbox" value="" >
+        </div>
+        <div class="col-2">
+            <label for="dateCreated" class="col-form-label">Datum:</label> &nbsp;&nbsp;
+            <input type="text" class="form-control-plaintext" id="dateCreated" placeholder="--/--/--"
+                value="{{predictor.dateCreated | date: 'dd/MM/yyyy'}}" readonly>
+        </div>
+
+        <!--
+        <br><br>
+        <div class="form-group row mt-5 mb-3">
+            <div class="col"></div>
+            <button class="btn btn-lg col-4" style="background-color:#003459; color:white;"
+                (click)="addModel();">Sačuvaj model</button>
+            <div class="col"></div>
+            <button class="btn btn-lg col-4" style="background-color:#003459; color:white;"
+                (click)="trainModel();">Treniraj model</button>
+            <div class="col"></div>
+        </div>
+
+        -->
+        
+    </div>
+</div>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/predict/predict.component.ts b/frontend/src/app/_pages/predict/predict.component.ts
index 0e313c65..d5cb22bd 100644
--- a/frontend/src/app/_pages/predict/predict.component.ts
+++ b/frontend/src/app/_pages/predict/predict.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import Predictor from 'src/app/_data/Predictor';
 
 @Component({
   selector: 'app-predict',
@@ -7,7 +8,10 @@ import { Component, OnInit } from '@angular/core';
 })
 export class PredictComponent implements OnInit {
 
-  constructor() { }
+  predictor:Predictor;
+  constructor() {
+    this.predictor = new Predictor();
+   }
 
   ngOnInit(): void {
   }