From 9d8640ec5a716c3e7b5bd036739d857250047f0b Mon Sep 17 00:00:00 2001
From: Danijel Andjelkovic <adanijel99@gmail.com>
Date: Tue, 15 Mar 2022 18:50:10 +0100
Subject: Dodao logo, promenio vecinu dugmica u mat-button stil.

---
 frontend/src/app/_pages/home/home.component.html | 90 ++++++++++++------------
 frontend/src/app/_pages/home/home.component.ts   | 18 ++++-
 2 files changed, 63 insertions(+), 45 deletions(-)

(limited to 'frontend/src/app/_pages')

diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html
index 7731054c..374cb324 100644
--- a/frontend/src/app/_pages/home/home.component.html
+++ b/frontend/src/app/_pages/home/home.component.html
@@ -1,51 +1,53 @@
-<div>
-    <div class="d-flex flex-column align-items-center">
-        <div *ngIf="shared.loggedIn" class="d-flex flex-column align-items-center">
-            <h2 class="my-4">Započnite sa treniranjem!</h2>
-            <div id="cards" class="d-flex flex-row justify-content-center align-items-start">
-                <div class="card shadow" style="width: 18rem;">
-                    <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">Moji izvori podataka</h3>
-                        <p class="card-text">
-                            <a class="stretched-link" routerLink="my-datasets">Preuredite</a> vaše izvore
-                            podataka, ili
-                            dodajte novi.
-                        </p>
-                    </div>
+<div class="d-flex flex-column align-items-center">
+    <img src="../../../assets/svg/logo.svg" class="bi me-2" width="256" height="256" role="img">
+    <div *ngIf="shared.loggedIn" class="d-flex flex-column align-items-center">
+        <h2 class="my-4">Započnite sa treniranjem!</h2>
+        <div id="cards" class="row align-items-center justify-content-center">
+            <div class="card shadow col-3 m-1" style="width: 18rem;">
+                <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">Moji izvori podataka</h3>
+                    <p class="card-text">
+                        <a class="stretched-link" routerLink="my-datasets">Preuredite</a> vaše izvore
+                        podataka, ili
+                        dodajte novi.
+                    </p>
                 </div>
-                <div class="card mx-3 shadow" 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">Moji modeli</h3>
-                        <p class="card-text">
-                            <a class="stretched-link" routerLink="my-models">Pregledajte</a> vaše modele, menjajte ih,
-                            napravite nove modele, ili
-                            ih obrišite.
-                        </p>
-                    </div>
+            </div>
+            <div class="card shadow col-3 m-1" 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">Moji modeli</h3>
+                    <p class="card-text">
+                        <a class="stretched-link" routerLink="my-models">Pregledajte</a> vaše modele, menjajte ih,
+                        napravite nove modele, ili
+                        ih obrišite.
+                    </p>
                 </div>
-                <div class="card shadow" style="width: 18rem;">
-                    <div class="card-body">
-                        <mat-icon width="48px" height="48px"
-                            style="font-size: 48px; margin-left: 50%; transform: translateX(-100%);">batch_prediction
-                        </mat-icon>
-                        <h3 class="card-title my-2">Rezultati treniranja</h3>
-                        <p class="card-text">
-                            <a class="stretched-link" routerLink="my-predictors">Pregledajte</a> sve vaše trenirane
-                            modele,
-                            koristite ih da predvidite vrednosti za red ili skup podataka, ili ih obrišite.
-                        </p>
-                    </div>
+            </div>
+            <div class="card shadow col-3 m-1" style="width: 18rem;">
+                <div class="card-body">
+                    <mat-icon width="48px" height="48px"
+                        style="font-size: 48px; margin-left: 50%; transform: translateX(-100%);">batch_prediction
+                    </mat-icon>
+                    <h3 class="card-title my-2">Rezultati treniranja</h3>
+                    <p class="card-text">
+                        <a class="stretched-link" routerLink="my-predictors">Pregledajte</a> sve vaše trenirane
+                        modele,
+                        koristite ih da predvidite vrednosti za red ili skup podataka, ili ih obrišite.
+                    </p>
                 </div>
             </div>
-
         </div>
-        <h2 class="my-4">Pogledajte javne projekte!</h2>
-        <app-carousel [items]="publicDatasets">
-        </app-carousel>
+
     </div>
+    <h2 class="my-4">Pogledajte javne izvore podataka!</h2>
+    <app-carousel [items]="publicDatasets">
+    </app-carousel>
+    <h2 class="my-4">Iskoristite već trenirane modele!</h2>
+    <app-carousel [items]="publicPredictors">
+    </app-carousel>
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/home/home.component.ts b/frontend/src/app/_pages/home/home.component.ts
index eb9adf27..7e4471e8 100644
--- a/frontend/src/app/_pages/home/home.component.ts
+++ b/frontend/src/app/_pages/home/home.component.ts
@@ -12,14 +12,30 @@ import shared from 'src/app/Shared';
 export class HomeComponent implements OnInit {
 
   publicDatasets: Dataset[];
+  publicPredictors: Predictor[];
 
   shared = shared;
 
   constructor() {
     this.publicDatasets = [
-      new Dataset('Dataset1', 'Lorem ipsum dolor sir amet', ['kolona1', 'kolona2', 'kolona3']),
+      new Dataset('Titanik', 'Titanik', ['Kolona1', 'Kolona2', 'Ime', 'OsobaJePreživela']),
       new Dataset('Drugi Dataset', 'Lorem ipsum dolor sir amet', ['jabuka', 'kruska', 'jagoda']),
       new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5']),
+      new Dataset('Drugi Dataset', 'Lorem ipsum dolor sir amet', ['jabuka', 'kruska', 'jagoda']),
+      new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5']),
+      new Dataset('Drugi Dataset', 'Lorem ipsum dolor sir amet', ['jabuka', 'kruska', 'jagoda']),
+      new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5']),
+      new Dataset('Dataset III', 'Kratak opis izvora podataka', ['c1', 'c2', 'c3', 'c4', 'c5'])
+    ]
+    this.publicPredictors = [
+      new Predictor('Preživeli', 'Za uneto ime osobe, predvidja da li je ta osoba preživela ili ne.', ['Ime'], 'OsobaJePreživela'),
+      new Predictor('Drugi model', 'Lorem ipsum dolor sir amet', ['kruska'], 'jagoda'),
+      new Predictor('Treći model', 'Kratak opis modela', ['c1', 'c2', 'c3'], 'c5'),
+      new Predictor('Drugi model', 'Lorem ipsum dolor sir amet', ['kruska'], 'jagoda'),
+      new Predictor('Treći model', 'Kratak opis modela', ['c1', 'c2', 'c3'], 'c5'),
+      new Predictor('Drugi model', 'Lorem ipsum dolor sir amet', ['kruska'], 'jagoda'),
+      new Predictor('Treći model', 'Kratak opis modela', ['c1', 'c2', 'c3'], 'c5'),
+      new Predictor('Treći model', 'Kratak opis modela', ['c1', 'c2', 'c3'], 'c5')
     ]
   }
 
-- 
cgit v1.2.3