diff --git a/angular/src/navigation/ion-tabs.ts b/angular/src/navigation/ion-tabs.ts index 02bf6038e9..c0b96d43b6 100644 --- a/angular/src/navigation/ion-tabs.ts +++ b/angular/src/navigation/ion-tabs.ts @@ -11,8 +11,6 @@ export class Tabs { @HostListener('ionTabbarClick', ['$event']) ionTabbarClick(ev: UIEvent) { - console.log('ionTabbarClick', ev); - const tabElm: HTMLIonTabElement = ev.detail as any; if (tabElm && tabElm.href) { console.log('tabElm', tabElm.href); diff --git a/angular/test/nav/src/app/app-routing.module.ts b/angular/test/nav/src/app/app-routing.module.ts index f23e72c724..d928d6e78d 100644 --- a/angular/test/nav/src/app/app-routing.module.ts +++ b/angular/test/nav/src/app/app-routing.module.ts @@ -3,26 +3,27 @@ import { Routes, RouterModule } from '@angular/router'; const routes: Routes = [ { path: '', redirectTo: '/home', pathMatch: 'full' }, - { path: 'basic-inputs', loadChildren: 'app/basic-inputs-page/basic-inputs-page.module#BasicInputsPageModule' }, - { path: 'show-hide-when', loadChildren: 'app/show-hide-when/show-hide-when.module#ShowHideWhenModule' }, - { path: 'form-sample', loadChildren: 'app/form-sample-page/form-sample-page.module#FormSamplePageModule' }, - { path: 'group-inputs', loadChildren: 'app/group-inputs-page/group-inputs-page.module#GroupInputsPageModule' }, - { path: 'home', loadChildren: 'app/home-page/home-page.module#HomePageModule' }, - { path: 'alert', loadChildren: 'app/alert/alert.module#AlertModule' }, - { path: 'actionSheet', loadChildren: 'app/action-sheet/action-sheet.module#ActionSheetModule' }, - { path: 'badge', loadChildren: 'app/badge/badge.module#BadgeModule' }, - { path: 'card', loadChildren: 'app/card/card.module#CardModule' }, - { path: 'content', loadChildren: 'app/content/content.module#ContentModule' }, - { path: 'toast', loadChildren: 'app/toast/toast.module#ToastModule' }, - { path: 'loading', loadChildren: 'app/loading/loading.module#LoadingModule' }, - { path: 'modal', loadChildren: 'app/modal/modal.module#ModalModule' }, - { path: 'popover', loadChildren: 'app/popover/popover.module#PopoverModule' }, - { path: 'segment', loadChildren: 'app/segment/segment.module#SegmentModule' }, - { path: 'virtual-scroll', loadChildren: 'app/virtual-scroll/virtual-scroll.module#VirtualScrollModule' }, + { path: 'basic-inputs', loadChildren: './basic-inputs-page/basic-inputs-page.module#BasicInputsPageModule' }, + { path: 'show-hide-when', loadChildren: './show-hide-when/show-hide-when.module#ShowHideWhenModule' }, + { path: 'form-sample', loadChildren: './form-sample-page/form-sample-page.module#FormSamplePageModule' }, + { path: 'group-inputs', loadChildren: './group-inputs-page/group-inputs-page.module#GroupInputsPageModule' }, + { path: 'home', loadChildren: './home-page/home-page.module#HomePageModule' }, + { path: 'alert', loadChildren: './alert/alert.module#AlertModule' }, + { path: 'actionSheet', loadChildren: './action-sheet/action-sheet.module#ActionSheetModule' }, + { path: 'badge', loadChildren: './badge/badge.module#BadgeModule' }, + { path: 'card', loadChildren: './card/card.module#CardModule' }, + { path: 'content', loadChildren: './content/content.module#ContentModule' }, + { path: 'toast', loadChildren: './toast/toast.module#ToastModule' }, + { path: 'loading', loadChildren: './loading/loading.module#LoadingModule' }, + { path: 'modal', loadChildren: './modal/modal.module#ModalModule' }, + { path: 'popover', loadChildren: './popover/popover.module#PopoverModule' }, + { path: 'segment', loadChildren: './segment/segment.module#SegmentModule' }, + { path: 'virtual-scroll', loadChildren: './virtual-scroll/virtual-scroll.module#VirtualScrollModule' }, - { path: 'no-routing-nav', loadChildren: 'app/no-routing-nav/no-routing-nav.module#NoRoutingNavModule' }, - { path: 'simple-nav', loadChildren: 'app/simple-nav/simple-nav.module#SimpleNavModule' }, - { path: 'static-tabs', loadChildren: 'app/static-tabs/tabs.module#TabsModule' }, + { path: 'no-routing-nav', loadChildren: './no-routing-nav/no-routing-nav.module#NoRoutingNavModule' }, + { path: 'simple-nav', loadChildren: './simple-nav/simple-nav.module#SimpleNavModule' }, + { path: 'simple-tabs', loadChildren: './simple-tabs/tabs.module#TabsModule' }, + { path: 'static-tabs', loadChildren: './static-tabs/tabs.module#TabsModule' }, ]; @NgModule({ diff --git a/angular/test/nav/src/app/home-page/home-page.component.html b/angular/test/nav/src/app/home-page/home-page.component.html index 671f53b6f2..ba0161c5ee 100644 --- a/angular/test/nav/src/app/home-page/home-page.component.html +++ b/angular/test/nav/src/app/home-page/home-page.component.html @@ -49,6 +49,20 @@
  • Simple Nav
    • +
  • + Simple Tabs + +
  • Static Tabs
    • diff --git a/angular/test/nav/src/app/simple-tabs/camaro/camaro-routing.module.ts b/angular/test/nav/src/app/simple-tabs/camaro/camaro-routing.module.ts new file mode 100755 index 0000000000..d55a83a61d --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/camaro/camaro-routing.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { IonicModule } from '@ionic/angular'; +import { CamaroPage } from './camaro.page'; + +const routes: Routes = [ + { path: '', component: CamaroPage, outlet: 'tab2' } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes), IonicModule], + exports: [RouterModule, IonicModule] +}) +export class CamaroPageRoutingModule { } diff --git a/angular/test/nav/src/app/simple-tabs/camaro/camaro.module.ts b/angular/test/nav/src/app/simple-tabs/camaro/camaro.module.ts new file mode 100755 index 0000000000..816acd5f20 --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/camaro/camaro.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { IonicModule } from '@ionic/angular'; +import { CamaroPage } from './camaro.page'; +import { CamaroPageRoutingModule } from './camaro-routing.module'; + + +@NgModule({ + imports: [ + CommonModule, + IonicModule, + CamaroPageRoutingModule + ], + declarations: [ + CamaroPage + ] +}) +export class CamaroModule {} diff --git a/angular/test/nav/src/app/simple-tabs/camaro/camaro.page.ts b/angular/test/nav/src/app/simple-tabs/camaro/camaro.page.ts new file mode 100755 index 0000000000..fe49b571cb --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/camaro/camaro.page.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; + + +@Component({ + selector: 'camaro-page', + template: ` + + + Camaro + + + + Camaro + + ` +}) +export class CamaroPage {} diff --git a/angular/test/nav/src/app/simple-tabs/charger/charger-routing.module.ts b/angular/test/nav/src/app/simple-tabs/charger/charger-routing.module.ts new file mode 100755 index 0000000000..c240416c23 --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/charger/charger-routing.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { IonicModule } from '@ionic/angular'; +import { ChargerPage } from './charger.page'; + +const routes: Routes = [ + { path: '', component: ChargerPage, outlet: 'tab3' } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes), IonicModule], + exports: [RouterModule, IonicModule] +}) +export class ChargerPageRoutingModule { } diff --git a/angular/test/nav/src/app/simple-tabs/charger/charger.module.ts b/angular/test/nav/src/app/simple-tabs/charger/charger.module.ts new file mode 100755 index 0000000000..3eae27fc0e --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/charger/charger.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { IonicModule } from '@ionic/angular'; +import { ChargerPage } from './charger.page'; +import { ChargerPageRoutingModule } from './charger-routing.module'; + + +@NgModule({ + imports: [ + CommonModule, + IonicModule, + ChargerPageRoutingModule + ], + declarations: [ + ChargerPage + ] +}) +export class ChargerModule {} diff --git a/angular/test/nav/src/app/simple-tabs/charger/charger.page.ts b/angular/test/nav/src/app/simple-tabs/charger/charger.page.ts new file mode 100755 index 0000000000..95cebe3949 --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/charger/charger.page.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; + + +@Component({ + selector: 'charger-page', + template: ` + + + Charger + + + + Charger + + ` +}) +export class ChargerPage {} diff --git a/angular/test/nav/src/app/simple-tabs/mustang/mustang-routing.module.ts b/angular/test/nav/src/app/simple-tabs/mustang/mustang-routing.module.ts new file mode 100755 index 0000000000..3d6871b803 --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/mustang/mustang-routing.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { IonicModule } from '@ionic/angular'; +import { MustangPage } from './mustang.page'; + +const routes: Routes = [ + { path: '', component: MustangPage, outlet: 'tab1' } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes), IonicModule], + exports: [RouterModule, IonicModule] +}) +export class MustangPageRoutingModule { } diff --git a/angular/test/nav/src/app/simple-tabs/mustang/mustang.module.ts b/angular/test/nav/src/app/simple-tabs/mustang/mustang.module.ts new file mode 100755 index 0000000000..59c2a929f4 --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/mustang/mustang.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { IonicModule } from '@ionic/angular'; +import { MustangPage } from './mustang.page'; +import { MustangPageRoutingModule } from './mustang-routing.module'; + + +@NgModule({ + imports: [ + CommonModule, + IonicModule, + MustangPageRoutingModule + ], + declarations: [ + MustangPage + ] +}) +export class MustangModule {} diff --git a/angular/test/nav/src/app/simple-tabs/mustang/mustang.page.ts b/angular/test/nav/src/app/simple-tabs/mustang/mustang.page.ts new file mode 100755 index 0000000000..c984c21f7c --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/mustang/mustang.page.ts @@ -0,0 +1,17 @@ +import { Component } from '@angular/core'; + + +@Component({ + selector: 'mustang-page', + template: ` + + + Mustang + + + + Mustang + + ` +}) +export class MustangPage {} diff --git a/angular/test/nav/src/app/simple-tabs/tabs-routing.module.ts b/angular/test/nav/src/app/simple-tabs/tabs-routing.module.ts new file mode 100755 index 0000000000..26bf14669a --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/tabs-routing.module.ts @@ -0,0 +1,40 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { IonicModule } from '@ionic/angular'; +import { TabsPageComponent } from './tabs.component'; + +const routes: Routes = [ + { + path: 'tabs', + component: TabsPageComponent, + children: [ + { + path: 'mustang', + outlet: 'tab1', + loadChildren: 'app/simple-tabs/mustang/mustang.module#MustangModule' + }, + { + path: 'camaro', + outlet: 'tab2', + loadChildren: 'app/simple-tabs/camaro/camaro.module#CamaroModule' + }, + { + path: 'charger', + outlet: 'tab3', + loadChildren: 'app/simple-tabs/charger/charger.module#ChargerModule' + } + ] + }, +]; + + +@NgModule({ + imports: [ + RouterModule.forChild(routes) + ], + exports: [ + RouterModule + ] +}) +export class TabsRoutingModule { } diff --git a/angular/test/nav/src/app/simple-tabs/tabs.component.ts b/angular/test/nav/src/app/simple-tabs/tabs.component.ts new file mode 100755 index 0000000000..e9309416ec --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/tabs.component.ts @@ -0,0 +1,7 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'tabs-root', + templateUrl: 'tabs.html' +}) +export class TabsPageComponent {} diff --git a/angular/test/nav/src/app/simple-tabs/tabs.html b/angular/test/nav/src/app/simple-tabs/tabs.html new file mode 100644 index 0000000000..1ab16b61eb --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/tabs.html @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/angular/test/nav/src/app/simple-tabs/tabs.module.ts b/angular/test/nav/src/app/simple-tabs/tabs.module.ts new file mode 100755 index 0000000000..a19be2a8f3 --- /dev/null +++ b/angular/test/nav/src/app/simple-tabs/tabs.module.ts @@ -0,0 +1,19 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { IonicModule } from '@ionic/angular'; +import { TabsPageComponent } from './tabs.component'; +import { TabsRoutingModule } from './tabs-routing.module'; + + +@NgModule({ + imports: [ + CommonModule, + IonicModule, + TabsRoutingModule, + ], + declarations: [ + TabsPageComponent, + ] +}) +export class TabsModule {}