diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5bf196048..bdea0e895 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -54,6 +54,7 @@ import { CoreUpdateManagerProvider } from '../providers/update-manager'; import { CorePluginFileDelegate } from '../providers/plugin-file-delegate'; import { CoreLoginModule } from '../core/login/login.module'; +import { CoreMainMenuModule } from '../core/mainmenu/mainmenu.module'; // For translate loader. AoT requires an exported function for factories. export function createTranslateLoader(http: HttpClient) { @@ -79,7 +80,8 @@ export function createTranslateLoader(http: HttpClient) { } }), CoreEmulatorModule, - CoreLoginModule + CoreLoginModule, + CoreMainMenuModule ], bootstrap: [IonicApp], entryComponents: [ diff --git a/src/core/login/pages/credentials/credentials.module.ts b/src/core/login/pages/credentials/credentials.module.ts index c69b2b8b4..88e6e955e 100644 --- a/src/core/login/pages/credentials/credentials.module.ts +++ b/src/core/login/pages/credentials/credentials.module.ts @@ -15,7 +15,6 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { CoreLoginCredentialsPage } from './credentials'; -import { CoreLoginModule } from '../../login.module'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '../../../../components/components.module'; import { CoreDirectivesModule } from '../../../../directives/directives.module'; @@ -27,7 +26,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module'; imports: [ CoreComponentsModule, CoreDirectivesModule, - CoreLoginModule, IonicPageModule.forChild(CoreLoginCredentialsPage), TranslateModule.forChild() ] diff --git a/src/core/login/pages/email-signup/email-signup.module.ts b/src/core/login/pages/email-signup/email-signup.module.ts index 37b1fd5b7..451715de6 100644 --- a/src/core/login/pages/email-signup/email-signup.module.ts +++ b/src/core/login/pages/email-signup/email-signup.module.ts @@ -15,7 +15,6 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { CoreLoginEmailSignupPage } from './email-signup'; -import { CoreLoginModule } from '../../login.module'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '../../../../components/components.module'; import { CoreDirectivesModule } from '../../../../directives/directives.module'; @@ -27,7 +26,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module'; imports: [ CoreComponentsModule, CoreDirectivesModule, - CoreLoginModule, IonicPageModule.forChild(CoreLoginEmailSignupPage), TranslateModule.forChild() ] diff --git a/src/core/login/pages/forgotten-password/forgotten-password.module.ts b/src/core/login/pages/forgotten-password/forgotten-password.module.ts index 9cbc9148d..0df3a92da 100644 --- a/src/core/login/pages/forgotten-password/forgotten-password.module.ts +++ b/src/core/login/pages/forgotten-password/forgotten-password.module.ts @@ -15,7 +15,6 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { CoreLoginForgottenPasswordPage } from './forgotten-password'; -import { CoreLoginModule } from '../../login.module'; import { TranslateModule } from '@ngx-translate/core'; @NgModule({ @@ -23,7 +22,6 @@ import { TranslateModule } from '@ngx-translate/core'; CoreLoginForgottenPasswordPage ], imports: [ - CoreLoginModule, IonicPageModule.forChild(CoreLoginForgottenPasswordPage), TranslateModule.forChild() ] diff --git a/src/core/login/pages/init/init.module.ts b/src/core/login/pages/init/init.module.ts index ee877d5ab..9a0744bc9 100644 --- a/src/core/login/pages/init/init.module.ts +++ b/src/core/login/pages/init/init.module.ts @@ -15,14 +15,12 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { CoreLoginInitPage } from './init'; -import { CoreLoginModule } from '../../login.module'; @NgModule({ declarations: [ CoreLoginInitPage, ], imports: [ - CoreLoginModule, IonicPageModule.forChild(CoreLoginInitPage), ], }) diff --git a/src/core/login/pages/reconnect/reconnect.module.ts b/src/core/login/pages/reconnect/reconnect.module.ts index 929973d46..10260486f 100644 --- a/src/core/login/pages/reconnect/reconnect.module.ts +++ b/src/core/login/pages/reconnect/reconnect.module.ts @@ -16,7 +16,6 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreLoginReconnectPage } from './reconnect'; -import { CoreLoginModule } from '../../login.module'; import { CoreComponentsModule } from '../../../../components/components.module'; import { CoreDirectivesModule } from '../../../../directives/directives.module'; @@ -27,7 +26,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module'; imports: [ CoreComponentsModule, CoreDirectivesModule, - CoreLoginModule, IonicPageModule.forChild(CoreLoginReconnectPage), TranslateModule.forChild() ] diff --git a/src/core/login/pages/site-policy/site-policy.module.ts b/src/core/login/pages/site-policy/site-policy.module.ts index 27168a1ff..c029e1c64 100644 --- a/src/core/login/pages/site-policy/site-policy.module.ts +++ b/src/core/login/pages/site-policy/site-policy.module.ts @@ -15,7 +15,6 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { CoreLoginSitePolicyPage } from './site-policy'; -import { CoreLoginModule } from '../../login.module'; import { TranslateModule } from '@ngx-translate/core'; import { CoreComponentsModule } from '../../../../components/components.module'; import { CoreDirectivesModule } from '../../../../directives/directives.module'; @@ -27,7 +26,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module'; imports: [ CoreComponentsModule, CoreDirectivesModule, - CoreLoginModule, IonicPageModule.forChild(CoreLoginSitePolicyPage), TranslateModule.forChild() ] diff --git a/src/core/login/pages/site/site.module.ts b/src/core/login/pages/site/site.module.ts index a22ceb243..b446ba9fb 100644 --- a/src/core/login/pages/site/site.module.ts +++ b/src/core/login/pages/site/site.module.ts @@ -15,7 +15,6 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { CoreLoginSitePage } from './site'; -import { CoreLoginModule } from '../../login.module'; import { TranslateModule } from '@ngx-translate/core'; import { CoreDirectivesModule } from '../../../../directives/directives.module'; @@ -25,7 +24,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module'; ], imports: [ CoreDirectivesModule, - CoreLoginModule, IonicPageModule.forChild(CoreLoginSitePage), TranslateModule.forChild() ] diff --git a/src/core/login/pages/sites/sites.module.ts b/src/core/login/pages/sites/sites.module.ts index 52f9e6601..c643dbe4e 100644 --- a/src/core/login/pages/sites/sites.module.ts +++ b/src/core/login/pages/sites/sites.module.ts @@ -16,7 +16,6 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreLoginSitesPage } from './sites'; -import { CoreLoginModule } from '../../login.module'; import { CoreDirectivesModule } from '../../../../directives/directives.module'; @NgModule({ @@ -25,7 +24,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module'; ], imports: [ CoreDirectivesModule, - CoreLoginModule, IonicPageModule.forChild(CoreLoginSitesPage), TranslateModule.forChild() ], diff --git a/src/core/mainmenu/pages/menu/menu.module.ts b/src/core/mainmenu/pages/menu/menu.module.ts index 2f8f96523..668c58c97 100644 --- a/src/core/mainmenu/pages/menu/menu.module.ts +++ b/src/core/mainmenu/pages/menu/menu.module.ts @@ -16,14 +16,12 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreMainMenuPage } from './menu'; -import { CoreMainMenuModule } from '../../mainmenu.module'; @NgModule({ declarations: [ CoreMainMenuPage, ], imports: [ - CoreMainMenuModule, IonicPageModule.forChild(CoreMainMenuPage), TranslateModule.forChild() ], diff --git a/src/core/mainmenu/pages/more/more.module.ts b/src/core/mainmenu/pages/more/more.module.ts index dd338a3ea..f755c35c6 100644 --- a/src/core/mainmenu/pages/more/more.module.ts +++ b/src/core/mainmenu/pages/more/more.module.ts @@ -16,7 +16,6 @@ import { NgModule } from '@angular/core'; import { IonicPageModule } from 'ionic-angular'; import { TranslateModule } from '@ngx-translate/core'; import { CoreMainMenuMorePage } from './more'; -import { CoreMainMenuModule } from '../../mainmenu.module'; import { CoreComponentsModule } from '../../../../components/components.module'; import { CoreDirectivesModule } from '../../../../directives/directives.module'; @@ -27,7 +26,6 @@ import { CoreDirectivesModule } from '../../../../directives/directives.module'; imports: [ CoreComponentsModule, CoreDirectivesModule, - CoreMainMenuModule, IonicPageModule.forChild(CoreMainMenuMorePage), TranslateModule.forChild() ],