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

# Conflicts:
#	.gitignore

1 files changed, 30 insertions, 0 deletions

diff --git a/sandbox/TestIvanLjubisavljevic/frontend/src/app/laptop/laptop.component.ts b/sandbox/TestIvanLjubisavljevic/frontend/src/app/laptop/laptop.component.ts
new file mode 100755
index 00000000..94d711bb
--- /dev/null
+++ b/sandbox/TestIvanLjubisavljevic/frontend/src/app/laptop/laptop.component.ts
@@ -0,0 +1,30 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Laptop } from '../models/laptop';
+import { LibraryServiceService } from '../services/library.service';
+
+@Component({
+  selector: 'app-laptop',
+  templateUrl: './laptop.component.html',
+  styleUrls: ['./laptop.component.css']
+})
+export class LaptopComponent implements OnInit {
+  laptop?:Laptop
+  laptopoviM?:Laptop[]
+  constructor(private library: LibraryServiceService, private route:ActivatedRoute, private router:Router) { }
+
+  ngOnInit(): void {
+
+    this.route.params.subscribe(url =>{
+      this.library.dajLaptop(url["id"]).subscribe(laptop=>{
+        this.laptop = laptop;
+      })
+    })
+  }
+
+
+  pogledaj(id:String)
+  {
+    this.router.navigate(["/laptop/"+id])
+  }
+}