fix: revert changes to modal navigation e2e

Author: tbozhikov

e2e/modal-navigation-ng/app/app.component.ts

@@ -1,11 +1,11 @@
 import { Component, ViewContainerRef } from "@angular/core";
 import { Router, NavigationEnd } from "@angular/router";
-// import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
+import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
 
 import { ViewContainerRefService } from "./shared/ViewContainerRefService";
 
 import { AppModule } from "./app.module";
-import { ModalDialogOptions, ModalDialogService, NSLocationStrategy } from "nativescript-angular";
+import { ModalDialogOptions, ModalDialogService } from "nativescript-angular";
 import { ModalViewComponent } from "./modal-shared/modal-view.component";
 
 @Component({

e2e/modal-navigation-ng/app/app.module.ts

@@ -20,7 +20,8 @@ import { ModalSharedSecondComponent } from "./modal-shared/modal-shared-second.c
 import { ViewContainerRefService } from "./shared/ViewContainerRefService";
 
 import { enable as traceEnable, addCategories } from "tns-core-modules/trace";
-import { NativeScriptPlatformRef, routerTraceCategory } from "nativescript-angular";
+import { routerTraceCategory } from "nativescript-angular/trace";
+import { NativeScriptPlatformRef } from "nativescript-angular";
 
 addCategories(routerTraceCategory);
 traceEnable();

e2e/modal-navigation-ng/app/home/home.component.ts

@@ -1,6 +1,15 @@
 import { Component, ViewContainerRef } from "@angular/core";
-import { ModalDialogService, RouterExtensions } from "nativescript-angular";
+import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
+import { RouterExtensions } from "nativescript-angular/router";
+import { EventData } from "tns-core-modules/data/observable";
+
 import { ViewContainerRefService } from "../shared/ViewContainerRefService";
+import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";
+import { ModalComponent } from "../modal/modal.component";
+import { ModalViewComponent } from "../modal-shared/modal-view.component";
+import { confirm } from "tns-core-modules/ui/dialogs";
+
+import { AppModule } from "../app.module";
 
 @Component({
   moduleId: module.id,

e2e/modal-navigation-ng/app/layout.component.ts

@@ -1,6 +1,6 @@
 import { Component, ViewContainerRef } from "@angular/core";
 import { Router, NavigationEnd } from "@angular/router";
-import { NSLocationStrategy } from "nativescript-angular/router";
+import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
 import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
 import { ModalViewComponent } from "./modal-shared/modal-view.component";
 import { ViewContainerRefService } from "./shared/ViewContainerRefService";

e2e/modal-navigation-ng/app/main.aot.ts

@@ -1,7 +1,5 @@
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
-import { platformNativeScript } from "nativescript-angular";
-console.log(">>>>>>>>main.aot.ts");
-
+import { platformNativeScript } from "nativescript-angular/platform-static";
 import { AppModule } from "./app.module";
 import { NativeScriptPlatformRef } from "nativescript-angular";
 // "./app.module.ngfactory" is a dynamically generated module when compiled with AoT.

e2e/modal-navigation-ng/app/main.ts

@@ -1,6 +1,5 @@
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
-import { platformNativeScriptDynamic } from "nativescript-angular";
-console.log(">>>>>>>>main.ts");
+import { platformNativeScriptDynamic } from "nativescript-angular/platform";
 
 import { AppModule } from "./app.module";
 import { NativeScriptPlatformRef } from "nativescript-angular";

e2e/modal-navigation-ng/app/named-router.component.ts

@@ -1,6 +1,6 @@
 import { Component, ViewContainerRef } from "@angular/core";
 import { Router, NavigationEnd } from "@angular/router";
-import { NSLocationStrategy } from "nativescript-angular";
+import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
 
 import { ViewContainerRefService } from "./shared/ViewContainerRefService";
 import { AppModule } from "./app.module";

e2e/modal-navigation-ng/app/tab.component.ts

@@ -1,6 +1,6 @@
 import { Component, ViewContainerRef } from "@angular/core";
 import { Router, NavigationEnd } from "@angular/router";
-// import { NSLocationStrategy } from "nativescript-angular";
+import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
 
 import { ViewContainerRefService } from "./shared/ViewContainerRefService";
 import { AppModule } from "./app.module";
@@ -14,14 +14,14 @@ import { ModalViewComponent } from "./modal-shared/modal-view.component";
 export class TabComponent  {
     constructor(
     router: Router,
-    // location: NSLocationStrategy,
+    location: NSLocationStrategy,
     private _vcRef: ViewContainerRef,
     private _viewContainerRefService: ViewContainerRefService,
     private modal: ModalDialogService) {
     router.events.subscribe(e => {
       if (e instanceof NavigationEnd) {
         console.log("[ROUTER]: " + e.toString());
-        // console.log(location.toString());
+        console.log(location.toString());
       }
     });