Merge branch 'redesign' into 'master'

merge

See merge request igrannonica/neuronstellar!29

1 files changed, 11 insertions, 19 deletions

diff --git a/frontend/src/app/app.component.ts b/frontend/src/app/app.component.ts
index 54c18bec..e301b46f 100644
--- a/frontend/src/app/app.component.ts
+++ b/frontend/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { Router, NavigationEnd, ActivatedRoute } from '@angular/router';
 import { filter, map } from 'rxjs';
@@ -11,9 +11,12 @@ import Shared from './Shared';
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css']
 })
-export class AppComponent implements OnInit {
+export class AppComponent implements OnInit, AfterViewInit {
+  constructor(private router: Router, private titleService: Title, private authService: AuthService, private signalRService: SignalRService, private http: HttpClient) {
 
-  constructor(private router: Router, private titleService: Title,private authService:AuthService,private signalRService:SignalRService,private http:HttpClient) { }
+  }
+  ngAfterViewInit(): void {
+  }
 
   ngOnInit() {
     this.router.events
@@ -36,22 +39,11 @@ export class AppComponent implements OnInit {
           this.titleService.setTitle(`${title} - Igrannonica`);
         }
       });
-      if(!this.authService.isAuthenticated())
-      {
+    if (!this.authService.isAuthenticated()) {
+      if(!this.authService.alreadyGuest())
         this.authService.addGuestToken();
-      }
-      this.signalRService.startConnection();
-      //this.startHttpRequest();
-
-
-
-
-  }
-  private startHttpRequest = () => {
-    this.http.get('http://localhost:5283/chatHub')
-      .subscribe(res => {
-      })
+    }
+    this.signalRService.startConnection();
+    //this.startHttpRequest();
   }
-
-
 }