S55069629 - Home page keep loading.

Route change for angular pages.

frontend/angular/.angular-cli.json

@@ -6,7 +6,7 @@
     "apps": [
         {
             "root": "src",
-            "outDir": "dist",
+            "outDir": "/home/chamathkalhara/Deploy/PerformaInvestments/webapps/cmsWebApp/ng",
             "assets": [
                 "assets",
                 "app/oneit/assets"

frontend/angular/package.json

@@ -21,6 +21,7 @@
         "@angular/platform-browser": "^5.2.0",
         "@angular/platform-browser-dynamic": "^5.2.0",
         "@angular/router": "^5.2.0",
+        "angular-google-tag-manager": "^1.1.1",
         "angular-tslint-rules": "^1.20.1",
         "bootstrap": "3.3.7",
         "chart.js": "2.7.1",

frontend/angular/src/app/components/admin-portal/admin-portal-layout/admin-portal-layout.component.ts

@@ -48,6 +48,7 @@ export class AdminPortalLayoutComponent implements OnInit, OnDestroy {
     jobApplicationID: string;
     jobNotSaved: boolean = false;
     gotoURL: any;
+    dataLayer: any;
 
     constructor(
         private deviceService: DeviceDetectorService,
@@ -107,6 +108,13 @@ export class AdminPortalLayoutComponent implements OnInit, OnDestroy {
                         this.jobNotSaved  = message.message;
                         this.changeDetector.detectChanges();
                     }
+                } else if (message.name === 'dataLayer') {
+                    if(message.message != null) {
+                        console.log(message.message[0]);
+                        this.dataLayer = message.message[0];
+                        console.log(message.message[0].userId); 
+                        console.log(message.message[0].stripeId);
+                    }
                 }
             }
         ));
@@ -241,6 +249,10 @@ export class AdminPortalLayoutComponent implements OnInit, OnDestroy {
     }
 
     menuItemClick(routerURL): void {
+        if (!(routerURL instanceof Array)) {
+            routerURL = ['/admin/' + routerURL];
+        }
+
         if (this.jobNotSaved) {
             this.gotoURL = routerURL;
             this.modalService.show(this.jobNotSavedModal);
@@ -255,6 +267,7 @@ export class AdminPortalLayoutComponent implements OnInit, OnDestroy {
 
     gotoNextPage() {
         this.modalService.hide(1);
+        this.jobNotSaved = false;
         this.router.navigate(this.gotoURL);
     }
 

frontend/angular/src/environments/environment.ts

 
 export const environment = {
     production: false,
-    baseUrl: 'http://vm4.qa03.oneit.com.au/matchd/',
+    baseUrl: 'http://localhost:8080/performa/',
     envName: 'QA',
     gtmKey: 'GTM-M6M4SW6'
 };