diff --git a/packages/demos/angular/package-lock.json b/packages/demos/angular/package-lock.json index a394ee9504..50d010b8b8 100644 --- a/packages/demos/angular/package-lock.json +++ b/packages/demos/angular/package-lock.json @@ -514,9 +514,9 @@ } }, "@ionic/core": { - "version": "0.0.2-52", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-0.0.2-52.tgz", - "integrity": "sha512-U5xRuZ8TmePy0cNRE4UgCUk0Z7jgr+f7L5wwrqHDlHyXCTVC7cFGIzf4nXlSJXIErcxS8q7Q6H5wchR5CiJAww==" + "version": "0.0.2-53", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-0.0.2-53.tgz", + "integrity": "sha512-AEvDmMrEphcc9tXNvrq96x2aYBB0FuzztNiFnC9QNMbGWtm2Y2eqGO2+nFOip76fClSJV1oJ4Zg0cIynX43U0w==" }, "@ngtools/json-schema": { "version": "1.1.0", diff --git a/packages/demos/angular/src/app/app-routing.module.ts b/packages/demos/angular/src/app/app-routing.module.ts index 764c580b00..a0010143a7 100644 --- a/packages/demos/angular/src/app/app-routing.module.ts +++ b/packages/demos/angular/src/app/app-routing.module.ts @@ -13,7 +13,7 @@ const routes: Routes = [ { 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: 'nav', loadChildren: 'app/nav/nav.module#NavModule' }, + { path: 'no-routing-nav', loadChildren: 'app/no-routing-nav/no-routing-nav.module#NoRoutingNavModule' }, { path: 'modal', loadChildren: 'app/modal/modal.module#ModalModule' }, { path: 'popover', loadChildren: 'app/popover/popover.module#PopoverModule' }, ]; diff --git a/packages/demos/angular/src/app/home-page/home-page.component.html b/packages/demos/angular/src/app/home-page/home-page.component.html index cba2413841..277548a496 100644 --- a/packages/demos/angular/src/app/home-page/home-page.component.html +++ b/packages/demos/angular/src/app/home-page/home-page.component.html @@ -2,41 +2,45 @@ Ionic Core Angular Demo Application - +
+ +
+ +
+

Nav Tests

+ No Routing +
diff --git a/packages/demos/angular/src/app/nav/nav-routing.module.ts b/packages/demos/angular/src/app/no-routing-nav/no-routing-nav-routing.module.ts similarity index 56% rename from packages/demos/angular/src/app/nav/nav-routing.module.ts rename to packages/demos/angular/src/app/no-routing-nav/no-routing-nav-routing.module.ts index 0a320b2423..b3f29924c2 100644 --- a/packages/demos/angular/src/app/nav/nav-routing.module.ts +++ b/packages/demos/angular/src/app/no-routing-nav/no-routing-nav-routing.module.ts @@ -1,14 +1,14 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { NavPageComponent } from './nav.component'; +import { NoRoutingNavPageComponent } from './no-routing-nav.component'; const routes: Routes = [ - { path: '', component: NavPageComponent } + { path: '', component: NoRoutingNavPageComponent } ]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class NavRoutingModule { } +export class NoRoutingNavRoutingModule { } diff --git a/packages/demos/angular/src/app/nav/nav.component.ts b/packages/demos/angular/src/app/no-routing-nav/no-routing-nav.component.ts similarity index 86% rename from packages/demos/angular/src/app/nav/nav.component.ts rename to packages/demos/angular/src/app/no-routing-nav/no-routing-nav.component.ts index 45e9f03242..044c2b56ad 100644 --- a/packages/demos/angular/src/app/nav/nav.component.ts +++ b/packages/demos/angular/src/app/no-routing-nav/no-routing-nav.component.ts @@ -10,7 +10,7 @@ import { PageOne } from './pages/page-one'; ` }) -export class NavPageComponent { +export class NoRoutingNavPageComponent { pageOne: any = PageOne; constructor() { diff --git a/packages/demos/angular/src/app/nav/nav.module.ts b/packages/demos/angular/src/app/no-routing-nav/no-routing-nav.module.ts similarity index 70% rename from packages/demos/angular/src/app/nav/nav.module.ts rename to packages/demos/angular/src/app/no-routing-nav/no-routing-nav.module.ts index f2c301daa6..fb6eaf2afb 100644 --- a/packages/demos/angular/src/app/nav/nav.module.ts +++ b/packages/demos/angular/src/app/no-routing-nav/no-routing-nav.module.ts @@ -1,8 +1,8 @@ import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { NavPageComponent } from './nav.component'; -import { NavRoutingModule } from './nav-routing.module'; +import { NoRoutingNavPageComponent } from './no-routing-nav.component'; +import { NoRoutingNavRoutingModule } from './no-routing-nav-routing.module'; import { IonicAngularModule, IonicRouterModule} from '@ionic/angular'; import { PageOne } from './pages/page-one'; @@ -12,12 +12,12 @@ import { PageThree } from './pages/page-three'; @NgModule({ imports: [ CommonModule, - NavRoutingModule, + NoRoutingNavRoutingModule, IonicAngularModule, IonicRouterModule ], declarations: [ - NavPageComponent, + NoRoutingNavPageComponent, PageOne, PageTwo, PageThree @@ -29,4 +29,4 @@ import { PageThree } from './pages/page-three'; ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) -export class NavModule { } +export class NoRoutingNavModule { } diff --git a/packages/demos/angular/src/app/nav/pages/page-one.ts b/packages/demos/angular/src/app/no-routing-nav/pages/page-one.ts similarity index 100% rename from packages/demos/angular/src/app/nav/pages/page-one.ts rename to packages/demos/angular/src/app/no-routing-nav/pages/page-one.ts diff --git a/packages/demos/angular/src/app/nav/pages/page-three.ts b/packages/demos/angular/src/app/no-routing-nav/pages/page-three.ts similarity index 100% rename from packages/demos/angular/src/app/nav/pages/page-three.ts rename to packages/demos/angular/src/app/no-routing-nav/pages/page-three.ts diff --git a/packages/demos/angular/src/app/nav/pages/page-two.ts b/packages/demos/angular/src/app/no-routing-nav/pages/page-two.ts similarity index 100% rename from packages/demos/angular/src/app/nav/pages/page-two.ts rename to packages/demos/angular/src/app/no-routing-nav/pages/page-two.ts diff --git a/packages/demos/angular/src/index.html b/packages/demos/angular/src/index.html index 150ddd7248..fdcc3fd0b6 100644 --- a/packages/demos/angular/src/index.html +++ b/packages/demos/angular/src/index.html @@ -8,6 +8,9 @@ +