Skip to content

Commit ed16c12

Browse files
tbozhikovtbozhikov
committed
initial commit
1 parent e1b9328 commit ed16c12

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+678
-64
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Component, ViewContainerRef } from "@angular/core";
22
import { Router, NavigationEnd } from "@angular/router";
3-
import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
3+
// import { NSLocationStrategy } from "@nativescript/angular/router/ns-location-strategy";
44

55
import { ViewContainerRefService } from "./shared/ViewContainerRefService";
66

77
import { AppModule } from "./app.module";
8-
import { ModalDialogOptions, ModalDialogService } from "nativescript-angular";
8+
import { ModalDialogOptions, ModalDialogService, NSLocationStrategy } from "@nativescript/angular";
99
import { ModalViewComponent } from "./modal-shared/modal-view.component";
1010

1111
@Component({

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
2-
import { NativeScriptModule } from "nativescript-angular/nativescript.module";
2+
import { NativeScriptModule } from "@nativescript/angular/nativescript.module";
33
import { AppRoutingModule } from "./app.routing";
44
import { AppComponent } from "./app.component";
55
import { NamedRouterComponent } from "./named-router.component";
@@ -20,8 +20,7 @@ import { ModalSharedSecondComponent } from "./modal-shared/modal-shared-second.c
2020
import { ViewContainerRefService } from "./shared/ViewContainerRefService";
2121

2222
import { enable as traceEnable, addCategories } from "tns-core-modules/trace";
23-
import { routerTraceCategory } from "nativescript-angular/trace";
24-
import { NativeScriptPlatformRef } from "nativescript-angular";
23+
import { NativeScriptPlatformRef, routerTraceCategory } from "@nativescript/angular";
2524

2625
addCategories(routerTraceCategory);
2726
traceEnable();

‎e2e/modal-navigation-ng/app/app.routing.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { NgModule } from "@angular/core";
2-
import { NativeScriptRouterModule } from "nativescript-angular/router";
2+
import { NativeScriptRouterModule } from "@nativescript/angular/router";
33
import { Routes, Router } from "@angular/router";
44

55
import { HomeComponent } from "./home/home.component";

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
import { Component, ViewContainerRef } from "@angular/core";
2-
import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
3-
import { RouterExtensions } from "nativescript-angular/router";
4-
import { EventData } from "tns-core-modules/data/observable";
5-
2+
import { ModalDialogService, RouterExtensions } from "@nativescript/angular";
63
import { ViewContainerRefService } from "../shared/ViewContainerRefService";
7-
import { ModalRouterComponent } from "../modal/modal-router/modal-router.component";
8-
import { ModalComponent } from "../modal/modal.component";
9-
import { ModalViewComponent } from "../modal-shared/modal-view.component";
10-
import { confirm } from "tns-core-modules/ui/dialogs";
11-
12-
import { AppModule } from "../app.module";
134

145
@Component({
156
moduleId: module.id,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component, ViewContainerRef } from "@angular/core";
22
import { Router, NavigationEnd } from "@angular/router";
3-
import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
4-
import { ModalDialogService, ModalDialogOptions } from "nativescript-angular/directives/dialogs";
3+
import { NSLocationStrategy } from "@nativescript/angular/router";
4+
import { ModalDialogService, ModalDialogOptions } from "@nativescript/angular/directives/dialogs";
55
import { ModalViewComponent } from "./modal-shared/modal-view.component";
66
import { ViewContainerRefService } from "./shared/ViewContainerRefService";
77
import { AppModule } from "./app.module";

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// this import should be first in order to load some required settings (like globals and reflect-metadata)
2-
import { platformNativeScript } from "nativescript-angular/platform-static";
2+
import { platformNativeScript } from "@nativescript/angular";
3+
console.log(">>>>>>>>main.aot.ts");
4+
35
import { AppModule } from "./app.module";
4-
import { NativeScriptPlatformRef } from "nativescript-angular";
6+
import { NativeScriptPlatformRef } from "@nativescript/angular";
57
// "./app.module.ngfactory" is a dynamically generated module when compiled with AoT.
68
import { AppModuleNgFactory } from "./app.module.ngfactory";
79

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
// this import should be first in order to load some required settings (like globals and reflect-metadata)
2-
import { platformNativeScriptDynamic } from "nativescript-angular/platform";
2+
import { platformNativeScriptDynamic } from "@nativescript/angular";
3+
console.log(">>>>>>>>main.ts");
34

45
import { AppModule } from "./app.module";
5-
import { NativeScriptPlatformRef } from "nativescript-angular";
6+
import { NativeScriptPlatformRef } from "@nativescript/angular";
67

78
AppModule.platformRef = <NativeScriptPlatformRef>platformNativeScriptDynamic();
89
AppModule.platformRef.bootstrapModule(AppModule);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component } from "@angular/core";
22
import { View, ShownModallyData } from "tns-core-modules/ui/core/view"
3-
import { ModalDialogParams } from "nativescript-angular/directives/dialogs";
3+
import { ModalDialogParams } from "@nativescript/angular/directives/dialogs";
44

55
@Component({
66
moduleId: module.id,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component } from "@angular/core";
22
import { View } from "tns-core-modules/ui/core/view"
33
import { ActivatedRoute } from "@angular/router";
4-
import { RouterExtensions } from "nativescript-angular/router";
4+
import { RouterExtensions } from "@nativescript/angular/router";
55

66
@Component({
77
moduleId: module.id,

‎e2e/modal-navigation-ng/app/modal-shared/modal-shared-second.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Component } from "@angular/core";
2-
import { ModalDialogOptions, ModalDialogService } from "nativescript-angular/modal-dialog";
2+
import { ModalDialogOptions, ModalDialogService } from "@nativescript/angular/modal-dialog";
33

44
import { ViewContainerRefService } from "../shared/ViewContainerRefService";
55
import { ModalViewComponent } from "../modal-shared/modal-view.component";
6-
import { RouterExtensions } from "nativescript-angular/router";
6+
import { RouterExtensions } from "@nativescript/angular/router";
77

88
@Component({
99
selector: "ns-second",

0 commit comments

Comments
 (0)