From 256d849163e13b4bd8f2d6608d5e09e5fda988d8 Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Mon, 8 Jul 2019 12:40:31 +0300 Subject: [PATCH 1/2] chore: update package.json file --- e2e/tests-app-ng/package.json | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/e2e/tests-app-ng/package.json b/e2e/tests-app-ng/package.json index cbb98810e..d2d373f4f 100644 --- a/e2e/tests-app-ng/package.json +++ b/e2e/tests-app-ng/package.json @@ -29,24 +29,13 @@ "zone.js": "^0.9.1" }, "devDependencies": { - "babel-traverse": "6.24.1", - "babel-types": "6.24.1", - "babylon": "6.17.0", - "codelyzer": "^4.0.0", - "filewalker": "^0.1.3", - "lazy": "1.0.11", - "nativescript-dev-typescript": "next", + "@angular/compiler-cli": "~8.0.0", + "@ngtools/webpack": "~8.0.0", "nativescript-dev-webpack": "next", - "tslint": "^5.4.3" + "tslint": "^5.4.3", + "typescript": "^3.4.1" }, "scripts": { - "tslint": "tslint --config tslint.json 'app/**/*.ts'", - "ns-bundle": "ns-bundle", - "start-android-bundle": "npm run ns-bundle --android --run-app", - "start-ios-bundle": "npm run ns-bundle --ios --run-app", - "build-android-bundle": "npm run ns-bundle --android --build-app", - "build-ios-bundle": "npm run ns-bundle --ios --build-app", - "publish-ios-bundle": "npm run ns-bundle --ios --publish-app", - "generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install" + "tslint": "tslint --config tslint.json 'app/**/*.ts'" } } From 4eef03ceee146e9412da2ea57a2786d2aa23fed2 Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Mon, 8 Jul 2019 13:39:02 +0300 Subject: [PATCH 2/2] e2e(tests-app-ng): add bottom-navigation component Update tabs component. --- e2e/tests-app-ng/app/app.routes.ts | 7 +- .../bottom-navigation.component.ts | 68 +++++++++++++++++++ e2e/tests-app-ng/app/tabs/tabs.component.ts | 30 ++++++-- 3 files changed, 96 insertions(+), 9 deletions(-) create mode 100644 e2e/tests-app-ng/app/bottom-navigation/bottom-navigation.component.ts diff --git a/e2e/tests-app-ng/app/app.routes.ts b/e2e/tests-app-ng/app/app.routes.ts index 9ed5574d0..d68882440 100644 --- a/e2e/tests-app-ng/app/app.routes.ts +++ b/e2e/tests-app-ng/app/app.routes.ts @@ -11,6 +11,7 @@ import { NavigationComponent, NAVIGATION_SUBROUTES } from "./router/router-outle import { LazyNavigationComponent } from "./router/lazy-module-navigation/lazy-navigation.component"; import { BindingComponent } from "./binding/binding-page.component"; +import { BottomNavigation } from "./bottom-navigation/bottom-navigation.component" import { ListViewComponent } from "./list-view/list-view-page.component"; import { ListViewControlComponent } from "./list-view/list-view-item-template.component"; @@ -61,6 +62,7 @@ export const routableComponents = [ SecondActionBarComponent, BindingComponent, + BottomNavigation, ListViewMainPageComponent, ListViewComponent, @@ -90,7 +92,7 @@ export const routableComponents = [ ButtonTextAlignmentComponent, ]; -// Set isNavigatable: true if the page is a mian page to other sub pages +// Set `isNavigatable: true` if the page is a main page to other sub pages export const routes = [ { path: "", component: MainComponent, data: { title: "" } }, { path: "", component: ModalContentComponent, data: { title: "" } }, @@ -119,6 +121,7 @@ export const routes = [ }, { path: "binding", component: BindingComponent, data: { title: "Binding", isNavigatable: true } }, + { path: "bottom-navigation", component: BottomNavigation, data: { title: "BottomNavigation", isNavigatable: true } }, { path: "ListViewExamples", @@ -158,7 +161,7 @@ export const routes = [ { path: "modal/lazy", component: LazyLoadModalComponent, data: { title: "modal(lazy)" } }, { path: "tab-view", component: TabViewComponent, data: { title: "tab-view", isNavigatable: true } }, - { path: "tabs", component: TabsComponent, data: { title: "tabs", isNavigatable: true } }, + { path: "tabs", component: TabsComponent, data: { title: "Tabs", isNavigatable: true } }, { path: "nav-options", component: NavigationOptionsComponent, data: { title: "nav-options", isNavigatable: true } }, { path: "nav-info", component: NavigationInfoComponent, data: { title: "nav-info" } }, diff --git a/e2e/tests-app-ng/app/bottom-navigation/bottom-navigation.component.ts b/e2e/tests-app-ng/app/bottom-navigation/bottom-navigation.component.ts new file mode 100644 index 000000000..5c547d9f6 --- /dev/null +++ b/e2e/tests-app-ng/app/bottom-navigation/bottom-navigation.component.ts @@ -0,0 +1,68 @@ +import { Component, OnInit } from "@angular/core"; + +@Component({ + selector: "bottom-navigation-component", + template: ` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + `, +}) + +export class BottomNavigation implements OnInit { + + public ngOnInit(): void { } + + goTo(bottomNavigation: any, index: number) { + bottomNavigation.selectedIndex = index; + } + +} diff --git a/e2e/tests-app-ng/app/tabs/tabs.component.ts b/e2e/tests-app-ng/app/tabs/tabs.component.ts index 7e6a895d0..a0e6efe8f 100644 --- a/e2e/tests-app-ng/app/tabs/tabs.component.ts +++ b/e2e/tests-app-ng/app/tabs/tabs.component.ts @@ -3,43 +3,53 @@ import { Component, OnInit } from "@angular/core"; @Component({ selector: "tabs-component", template: ` - + - + - - + + + + - - - @@ -48,5 +58,11 @@ import { Component, OnInit } from "@angular/core"; }) export class TabsComponent implements OnInit { + public ngOnInit(): void { } + + goTo(tabs: any, index: number) { + tabs.selectedIndex = index; + } + }