b

frontend/src/app/access.guard.ts

@@ -34,13 +34,18 @@ export class AccessGuard implements CanActivate {
   canActivate(
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
+
     return (async () => {
+
       if (this.backendService.active?.token?.in_role('root')) {
         return true;
       }
+
       this.router.navigate(['/authentication/login/'], {
         queryParams: route.queryParams
       });
+
     })();
+
   }
 }

frontend/src/app/app.component.html

@@ -4,4 +4,4 @@
   *ngIf="loading$ | async">
 </mat-progress-bar>
 
-<router-outlet></router-outlet>
+<router-outlet></router-outlet>

frontend/src/app/app.component.ts

@@ -6,7 +6,6 @@
 import { AfterContentChecked, ChangeDetectionStrategy, ChangeDetectorRef, Component } from '@angular/core';
 import { Subject, BehaviorSubject } from 'rxjs';
 import { GeneralService } from './_general/services/general.service';
-import { ThemeService } from './_general/services/theme.service';
 
 /**
  * Primary component for dashboard, encapsulating progress bar, and router outlet.
@@ -18,26 +17,22 @@ import { ThemeService } from './_general/services/theme.service';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class AppComponent implements AfterContentChecked {
-  title = 'Aista Magic Cloud';
+  title = 'AINIRO.IO Magic Cloud';
 
   loading$: Subject<any> = new BehaviorSubject(true);
 
-  /**
-   *
-   * @param loader To handle the loader generally.
-   * @param cdr To detect changes for handling the loader.
-   */
   constructor(
     private generalService: GeneralService,
-    private themeService: ThemeService,
     private cdr: ChangeDetectorRef) {
   }
 
-  ngAfterContentChecked(): void {
+  ngAfterContentChecked() {
+
     this.generalService.loading$.subscribe((res: any) => {
+
       this.cdr.markForCheck();
       this.loading$.next(res)
       this.cdr.detectChanges();
-    })
+    });
   }
 }

frontend/src/app/app.module.ts

@@ -39,6 +39,7 @@ import { CoreComponent } from './_layout/core/core.component';
 import { HeaderComponent } from './_layout/header/header.component';
 import { FooterComponent } from './_layout/footer/footer.component';
 
+// Misc
 import { AccessGuard } from './access.guard';
 import { AuthBaseComponent } from './public/authentication/auth-base/auth-base.component';
 import { SharedModule } from './shared.module';