From dce4e644d5e5d9c97ff5ac337448b52f2a2a64fd Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Wed, 2 Mar 2022 23:38:27 +0100
Subject: Merge branch 'dev' of
 http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Tamara

# Conflicts:
#	.gitignore
---
 .../frontend/src/app/laptop/laptop.component.html  | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100755 sandbox/TestIvanLjubisavljevic/frontend/src/app/laptop/laptop.component.html

(limited to 'sandbox/TestIvanLjubisavljevic/frontend/src/app/laptop/laptop.component.html')

diff --git a/sandbox/TestIvanLjubisavljevic/frontend/src/app/laptop/laptop.component.html b/sandbox/TestIvanLjubisavljevic/frontend/src/app/laptop/laptop.component.html
new file mode 100755
index 00000000..e1f90df3
--- /dev/null
+++ b/sandbox/TestIvanLjubisavljevic/frontend/src/app/laptop/laptop.component.html
@@ -0,0 +1,41 @@
+<div *ngIf="laptop" id="forma">
+    <h4>Karakteristike laptopa:</h4>
+  <b>Brend:</b> {{laptop.brand}}  <br>
+  <b>Model</b>: {{laptop.model}} <br>
+  <b>RAM</b>: {{laptop.ram}} GB<br>
+  <b>HDD</b>: {{laptop.hdd}} GB<br>
+  <b>Grafika</b>: {{laptop.graphics}} (GB)<br>
+  <b>Dijagonala ekrana</b>: {{laptop.display}} "<br>
+  <b>Procesor</b>: {{laptop.processor}} <br>
+  <b>Cena</b>: {{laptop.price}} €<br><br>
+
+
+  <table *ngIf="laptopoviM">
+    <tr>
+        <th colspan="9">LAPTOPOVI MARKE {{laptop.brand}}</th>
+    </tr>
+    <tr>
+        <th>Brend</th>
+        <th>MODEL</th>
+        <th>RAM</th>
+        <th>HDD</th>
+        <th>Grafika</th>
+        <th>Dijagonala ekrana</th>
+        
+        <th>Procesor</th>
+        <th>Cena</th>
+    </tr>
+    <tr *ngFor="let laptop of laptopoviM" (click)="pogledaj(laptop.id)">
+        <td>{{laptop.brand}}</td>
+        <td>{{laptop.model}}</td>
+        <td>{{laptop.ram}}</td>
+        <td>{{laptop.hdd}}</td>
+        <td>{{laptop.graphics}}</td>
+        <td>{{laptop.display}}</td>
+       
+        <td>{{laptop.processor}}</td>
+        <td>{{laptop.price}} €</td>
+    </tr>
+</table>
+</div>
+<router-outlet></router-outlet>
\ No newline at end of file
-- 
cgit v1.2.3