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

# Conflicts:
#	backend/api/api/appsettings.json

1 files changed, 10 insertions, 2 deletions

diff --git a/frontend/src/app/_elements/notifications/notifications.component.ts b/frontend/src/app/_elements/notifications/notifications.component.ts
index 6c1d555b..82613448 100644
--- a/frontend/src/app/_elements/notifications/notifications.component.ts
+++ b/frontend/src/app/_elements/notifications/notifications.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { WebSocketService } from 'src/app/_services/web-socket.service';
+import Notification from 'src/app/_data/Notification';
 
 @Component({
   selector: 'app-notifications',
@@ -8,9 +9,16 @@ import { WebSocketService } from 'src/app/_services/web-socket.service';
 })
 export class NotificationsComponent implements OnInit {
 
-  notifications?: any[];
+  notifications?: Notification[];
+  closed: boolean = false;
 
-  constructor(private wsService: WebSocketService) { }
+  constructor(private wsService: WebSocketService) {
+    this.notifications = [
+      new Notification("Titanik (Preziveli)", "79768456867", 0.2),
+      new Notification("Test Prediktor 1", "56758768678", 0.4),
+      new Notification("Test Prediktor 2", "11344556425", 0.7)
+    ]
+  }
 
   ngOnInit(): void {
     // this.wsService.send('test');