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

2 files changed, 16 insertions, 4 deletions

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 e69de29b..e94f67f5 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.html
+++ b/frontend/src/app/_pages/my-models/my-models.component.html
@@ -0,0 +1,5 @@
+<ul class="list-group my-2">
+    <li class="list-group-item" *ngFor="let model of myModels">
+        <app-item-model [model]="model"></app-item-model>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/frontend/src/app/_pages/my-models/my-models.component.ts b/frontend/src/app/_pages/my-models/my-models.component.ts
index e9bc52de..3ab57e59 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.ts
+++ b/frontend/src/app/_pages/my-models/my-models.component.ts
@@ -1,15 +1,22 @@
 import { Component, OnInit } from '@angular/core';
+import Model from 'src/app/_data/Model';
 
 @Component({
   selector: 'app-my-models',
   templateUrl: './my-models.component.html',
   styleUrls: ['./my-models.component.css']
 })
-export class MyModelsComponent implements OnInit {
+export class MyModelsComponent /*implements OnInit*/ {
+  myModels: Model[];
 
-  constructor() { }
+  constructor() {
+    this.myModels = [
+    new Model('Titanik', 'Opis titanik'),
+    new Model('Neki drugi set', 'opis'),
+    new Model('Treci set', 'opis')
+  ]; }
 
-  ngOnInit(): void {
+  /*ngOnInit(): void {
   }
-
+*/
 }