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

# Conflicts:
#	frontend/src/app/app.module.ts

1 files changed, 18 insertions, 2 deletions

diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts
index 8c6f8452..59f247ed 100644
--- a/frontend/src/app/app.component.ts
+++ b/frontend/src/app/app.component.ts
@@ -3,7 +3,9 @@ import { Title } from '@angular/platform-browser';
 import { Router, NavigationEnd, ActivatedRoute } from '@angular/router';
 import { filter, map } from 'rxjs';
 import { AuthService } from './_services/auth.service';
-
+import { SignalRService } from './_services/signal-r.service';
+import { HttpClient } from '@angular/common/http';
+import Shared from './Shared';
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
@@ -11,7 +13,7 @@ import { AuthService } from './_services/auth.service';
 })
 export class AppComponent implements OnInit {
 
-  constructor(private router: Router, private titleService: Title,private authService:AuthService) { }
+  constructor(private router: Router, private titleService: Title,private authService:AuthService,private signalRService:SignalRService,private http:HttpClient) { }
 
   ngOnInit() {
     this.router.events
@@ -38,5 +40,19 @@ export class AppComponent implements OnInit {
       {
         this.authService.addGuestToken();
       }
+      this.signalRService.startConnection();
+      //this.startHttpRequest();
+
+
+
+
+  }
+  private startHttpRequest = () => {
+    this.http.get('http://localhost:5283/chatHub')
+      .subscribe(res => {
+        console.log(res);
+      })
   }
+
+
 }