Route Tweaks

Author: Nishant Shuke

ui-trainer/src/app/app.component.ts

@@ -17,9 +17,9 @@ export class AppComponent {
   loggedIn = false;
 
   constructor(private matIconRegistry: MatIconRegistry,
-              private domSanitizer: DomSanitizer,
-              private route: ActivatedRoute,
-              private router: Router, public authService: AuthService) {
+    private domSanitizer: DomSanitizer,
+    private route: ActivatedRoute,
+    private router: Router, public authService: AuthService) {
     this.matIconRegistry.addSvgIcon(
       'project',
       this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/images/project.svg')
@@ -120,8 +120,12 @@ export class AppComponent {
     if (!this.authService.isTokenExpired()) {
       this.loggedIn = true;
       if (localStorage.getItem('jwt_token') === 'no_token' && window.location.href.split('/').pop() !== 'applications' && window.location.href.split('/').pop() !== 'home' && window.location.href.split('/').pop() !== '') {
-        sessionStorage.setItem('appParamExists', 'Y');
-        this.router.navigate(['applications', { app : window.location.href.split('/').pop() }]);
+        if (window.location.href.split('/').slice(-2)[0] !== 'home' && window.location.href.split('/').slice(-2)[0] !== 'conversations' && window.location.href.split('/').slice(-2)[0] !== 'trainer') {
+          sessionStorage.setItem('appParamExists', 'Y');
+          this.router.navigate(['applications', { app: window.location.href.split('/').pop() }]);
+        } else {
+          sessionStorage.setItem('appParamExists', 'N');
+        }
       } else {
         sessionStorage.setItem('appParamExists', 'N');
         this.router.navigate(['applications']);
@@ -131,9 +135,9 @@ export class AppComponent {
     }
   }
 
-  callParentApp () {
+  callParentApp() {
     localStorage.clear();
-    let url = environment.PARENT_APP_URL;   
+    let url = environment.PARENT_APP_URL;
     window.open(url, '_self');
   }
 }

ui-trainer/src/app/home/home.component.html

@@ -1,4 +1,4 @@
-<div *ngIf="appParamExists" class="header-full-height">
+<div *ngIf="!appParamExists" class="header-full-height">
     <app-header></app-header>
 </div>
 <div class="trainer-full-height">