3 files changed, 53 insertions, 58 deletions
diff --git a/frontend/src/app/_pages/archive/archive.component.html b/frontend/src/app/_pages/archive/archive.component.html
index 44c4d9c2..1d5d144f 100644
--- a/frontend/src/app/_pages/archive/archive.component.html
+++ b/frontend/src/app/_pages/archive/archive.component.html
@@ -1 +1,41 @@
-<p>archive works!</p>
+<div class="d-flex flex-column align-items-center">
+    <div *ngIf="publicDatasets.length > 0" class="my-5">
+        <app-playlist [datasets]="publicDatasets"></app-playlist>
+
+        <div class="rounded-pill bg-light p-4 m-2 text-center position-relative">
+            <a routerLink="browse-datasets" class="stretched-link">Pogledaj sve javne izvore podataka...</a>
+        </div>
+    </div>
+
+    <div id="cards" class="row align-items-view align-items-stretch justify-content-center">
+        <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%);">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>
+        <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">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 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%);">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>
+</div>
+\ No newline at end of file
diff --git a/frontend/src/app/_pages/archive/archive.component.ts b/frontend/src/app/_pages/archive/archive.component.ts
index e3ffd6e2..47f96218 100644
--- a/frontend/src/app/_pages/archive/archive.component.ts
+++ b/frontend/src/app/_pages/archive/archive.component.ts
@@ -1,4 +1,6 @@
 import { Component, OnInit } from '@angular/core';
+import Dataset from 'src/app/_data/Dataset';
+import { DatasetsService } from 'src/app/_services/datasets.service';
 
 @Component({
   selector: 'app-archive',
@@ -7,9 +9,17 @@ import { Component, OnInit } from '@angular/core';
 })
 export class ArchiveComponent implements OnInit {
 
-  constructor() { }
+  publicDatasets: Dataset[] = [];
+
+  constructor(private datasetsService: DatasetsService) { }
 
   ngOnInit(): void {
+    this.datasetsService.getPublicDatasets().subscribe((datasets) => {
+      this.publicDatasets = datasets;
+      this.publicDatasets.forEach((element, index) => {
+        this.publicDatasets[index] = (<Dataset>element);
+      })
+    });
   }
 
 }
diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html
index b673d074..f73e7571 100644
--- a/frontend/src/app/_pages/home/home.component.html
+++ b/frontend/src/app/_pages/home/home.component.html
@@ -3,7 +3,7 @@
         <img src="../../../assets/images/logo_igrannonica_temp.png" class="bi me-2" width="256" height="256" role="img">
     </div>
 
-    <div *ngIf="shared.loggedIn" class="d-flex flex-column align-items-center">
+    <div class="d-flex flex-column align-items-center">
 
         <div class="rounded-pill bg-light px-4 m-4 shadow-accent position-relative">
             <a routerLink="experiment" class="stretched-link">
@@ -13,62 +13,7 @@
             </a>
         </div>
 
-        <div id="cards" class="row align-items-view align-items-stretch justify-content-center">
-            <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%);">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>
-            <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">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 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%);">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>
 
-    </div>
 
-    <div *ngIf="publicDatasets.length > 0" class="my-5">
-        <!--<div class="rounded-pill bg-light px-4 m-2 mt-5 text-center">
-            <h2 class="my-2">Pogledajte javne izvore podataka!</h2>
-        </div>
-        <app-carousel [items]="publicDatasets" [type]="'Dataset'">
-        </app-carousel>-->
-        <app-playlist [datasets]="publicDatasets"></app-playlist>
-
-        <div class="rounded-pill bg-light p-4 m-2 text-center position-relative">
-            <a routerLink="browse-datasets" class="stretched-link">Pogledaj sve javne izvore podataka...</a>
-        </div>
     </div>
-
-    <!--<div *ngIf="publicPredictors.length > 0">
-        <div class="rounded-pill bg-light px-4 m-2 mt-5 text-center">
-            <h2 class="my-2">Iskoristite već trenirane modele!</h2>
-        </div>
-        <app-carousel [items]="publicPredictors" [type]="'Predictor'">
-        </app-carousel>
-
-        <div class="rounded-pill bg-light p-4 m-2 text-center position-relative">
-            <a routerLink="browse-predictors" class="stretched-link">Pogledaj sve javne trenirane modele...</a>
-        </div>
-    </div>-->
 </div>
 \ No newline at end of file