diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 2045643b0..ed4cf9987 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -27,7 +27,7 @@ const routes: Routes = [ }, { path: 'settings', - loadChildren: () => import('./core/settings/settings.module').then( m => m.CoreAppSettingsModule), + loadChildren: () => import('./core/settings/settings.module').then( m => m.CoreSettingsModule), }, { path: 'mainmenu', diff --git a/src/app/core/courses/courses.module.ts b/src/app/core/courses/courses.module.ts index c35f74b4f..38449fa0a 100644 --- a/src/app/core/courses/courses.module.ts +++ b/src/app/core/courses/courses.module.ts @@ -12,29 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { IonicModule } from '@ionic/angular'; -import { TranslateModule } from '@ngx-translate/core'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; import { CoreMainMenuDelegate } from '@core/mainmenu/services/delegate'; - import { CoreHomeMainMenuHandler } from './handlers/mainmenu'; -import { CoreCoursesHomePage } from './pages/home/home.page'; @NgModule({ - imports: [ - CommonModule, - IonicModule, - TranslateModule.forChild(), - CoreComponentsModule, - CoreDirectivesModule, - ], - declarations: [ - CoreCoursesHomePage, - ], + imports: [], + declarations: [], }) export class CoreCoursesModule { diff --git a/src/app/core/courses/pages/home/home.page.module.ts b/src/app/core/courses/pages/home/home.page.module.ts new file mode 100644 index 000000000..9397ce678 --- /dev/null +++ b/src/app/core/courses/pages/home/home.page.module.ts @@ -0,0 +1,47 @@ +// (C) Copyright 2015 Moodle Pty Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule, Routes } from '@angular/router'; +import { IonicModule } from '@ionic/angular'; +import { TranslateModule } from '@ngx-translate/core'; + +import { CoreComponentsModule } from '@components/components.module'; +import { CoreDirectivesModule } from '@directives/directives.module'; + +import { CoreCoursesHomePage } from './home.page'; + +const routes: Routes = [ + { + path: '', + component: CoreCoursesHomePage, + }, +]; + +@NgModule({ + imports: [ + RouterModule.forChild(routes), + CommonModule, + IonicModule, + TranslateModule.forChild(), + CoreComponentsModule, + CoreDirectivesModule, + ], + declarations: [ + CoreCoursesHomePage, + ], + exports: [RouterModule], +}) +export class CoreCoursesHomePageModule {} diff --git a/src/app/core/login/login-routing.module.ts b/src/app/core/login/login-routing.module.ts index 5c528b09b..384546ba8 100644 --- a/src/app/core/login/login-routing.module.ts +++ b/src/app/core/login/login-routing.module.ts @@ -15,11 +15,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CoreLoginCredentialsPage } from './pages/credentials/credentials.page'; -import { CoreLoginInitPage } from './pages/init/init.page'; -import { CoreLoginSitePage } from './pages/site/site.page'; -import { CoreLoginSitesPage } from './pages/sites/sites.page'; - const routes: Routes = [ { path: '', @@ -28,19 +23,19 @@ const routes: Routes = [ }, { path: 'init', - component: CoreLoginInitPage, + loadChildren: () => import('./pages/init/init.page.module').then( m => m.CoreLoginInitPageModule), }, { path: 'site', - component: CoreLoginSitePage, + loadChildren: () => import('./pages/site/site.page.module').then( m => m.CoreLoginSitePageModule), }, { path: 'credentials', - component: CoreLoginCredentialsPage, + loadChildren: () => import('./pages/credentials/credentials.page.module').then( m => m.CoreLoginCredentialsPageModule), }, { path: 'sites', - component: CoreLoginSitesPage, + loadChildren: () => import('./pages/sites/sites.page.module').then( m => m.CoreLoginSitesPageModule), }, ]; diff --git a/src/app/core/login/login.module.ts b/src/app/core/login/login.module.ts index 090f44698..fdfb74a9c 100644 --- a/src/app/core/login/login.module.ts +++ b/src/app/core/login/login.module.ts @@ -13,38 +13,12 @@ // limitations under the License. import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; -import { TranslateModule } from '@ngx-translate/core'; - -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - import { CoreLoginRoutingModule } from './login-routing.module'; -import { CoreLoginCredentialsPage } from './pages/credentials/credentials.page'; -import { CoreLoginInitPage } from './pages/init/init.page'; -import { CoreLoginSitePage } from './pages/site/site.page'; -import { CoreLoginSitesPage } from './pages/sites/sites.page'; @NgModule({ imports: [ - CommonModule, - IonicModule, CoreLoginRoutingModule, - CoreComponentsModule, - TranslateModule.forChild(), - FormsModule, - ReactiveFormsModule, - CoreComponentsModule, - CoreDirectivesModule, - ], - declarations: [ - CoreLoginCredentialsPage, - CoreLoginInitPage, - CoreLoginSitePage, - CoreLoginSitesPage, ], + declarations: [], }) export class CoreLoginModule {} diff --git a/src/app/core/login/pages/credentials/credentials.html b/src/app/core/login/pages/credentials/credentials.html index 13d91cb9d..e01cec562 100644 --- a/src/app/core/login/pages/credentials/credentials.html +++ b/src/app/core/login/pages/credentials/credentials.html @@ -7,7 +7,10 @@ {{ 'core.login.login' | translate }} - + + + diff --git a/src/app/core/login/pages/credentials/credentials.page.module.ts b/src/app/core/login/pages/credentials/credentials.page.module.ts new file mode 100644 index 000000000..50b2026c0 --- /dev/null +++ b/src/app/core/login/pages/credentials/credentials.page.module.ts @@ -0,0 +1,50 @@ +// (C) Copyright 2015 Moodle Pty Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { RouterModule, Routes } from '@angular/router'; +import { IonicModule } from '@ionic/angular'; +import { TranslateModule } from '@ngx-translate/core'; + +import { CoreComponentsModule } from '@components/components.module'; +import { CoreDirectivesModule } from '@directives/directives.module'; + +import { CoreLoginCredentialsPage } from './credentials.page'; + +const routes: Routes = [ + { + path: '', + component: CoreLoginCredentialsPage, + }, +]; + +@NgModule({ + imports: [ + RouterModule.forChild(routes), + CommonModule, + IonicModule, + TranslateModule.forChild(), + FormsModule, + ReactiveFormsModule, + CoreComponentsModule, + CoreDirectivesModule, + ], + declarations: [ + CoreLoginCredentialsPage, + ], + exports: [RouterModule], +}) +export class CoreLoginCredentialsPageModule {} diff --git a/src/app/core/login/pages/init/init.page.module.ts b/src/app/core/login/pages/init/init.page.module.ts new file mode 100644 index 000000000..8cd9d79f0 --- /dev/null +++ b/src/app/core/login/pages/init/init.page.module.ts @@ -0,0 +1,38 @@ +// (C) Copyright 2015 Moodle Pty Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { IonicModule } from '@ionic/angular'; + +import { CoreLoginInitPage } from './init.page'; + +const routes: Routes = [ + { + path: '', + component: CoreLoginInitPage, + }, +]; + +@NgModule({ + imports: [ + RouterModule.forChild(routes), + IonicModule, + ], + declarations: [ + CoreLoginInitPage, + ], + exports: [RouterModule], +}) +export class CoreLoginInitPageModule {} diff --git a/src/app/core/login/pages/site/site.page.module.ts b/src/app/core/login/pages/site/site.page.module.ts new file mode 100644 index 000000000..c73699573 --- /dev/null +++ b/src/app/core/login/pages/site/site.page.module.ts @@ -0,0 +1,50 @@ +// (C) Copyright 2015 Moodle Pty Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { RouterModule, Routes } from '@angular/router'; +import { IonicModule } from '@ionic/angular'; +import { TranslateModule } from '@ngx-translate/core'; + +import { CoreComponentsModule } from '@components/components.module'; +import { CoreDirectivesModule } from '@directives/directives.module'; + +import { CoreLoginSitePage } from './site.page'; + +const routes: Routes = [ + { + path: '', + component: CoreLoginSitePage, + }, +]; + +@NgModule({ + imports: [ + RouterModule.forChild(routes), + CommonModule, + IonicModule, + TranslateModule.forChild(), + FormsModule, + ReactiveFormsModule, + CoreComponentsModule, + CoreDirectivesModule, + ], + declarations: [ + CoreLoginSitePage, + ], + exports: [RouterModule], +}) +export class CoreLoginSitePageModule {} diff --git a/src/app/core/login/pages/sites/sites.page.module.ts b/src/app/core/login/pages/sites/sites.page.module.ts new file mode 100644 index 000000000..b70dd625f --- /dev/null +++ b/src/app/core/login/pages/sites/sites.page.module.ts @@ -0,0 +1,47 @@ +// (C) Copyright 2015 Moodle Pty Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule, Routes } from '@angular/router'; +import { IonicModule } from '@ionic/angular'; +import { TranslateModule } from '@ngx-translate/core'; + +import { CoreComponentsModule } from '@components/components.module'; +import { CoreDirectivesModule } from '@directives/directives.module'; + +import { CoreLoginSitesPage } from './sites.page'; + +const routes: Routes = [ + { + path: '', + component: CoreLoginSitesPage, + }, +]; + +@NgModule({ + imports: [ + RouterModule.forChild(routes), + CommonModule, + IonicModule, + TranslateModule.forChild(), + CoreComponentsModule, + CoreDirectivesModule, + ], + declarations: [ + CoreLoginSitesPage, + ], + exports: [RouterModule], +}) +export class CoreLoginSitesPageModule {} diff --git a/src/app/core/mainmenu/mainmenu-routing.module.ts b/src/app/core/mainmenu/mainmenu-routing.module.ts index fb2998542..9633807c5 100644 --- a/src/app/core/mainmenu/mainmenu-routing.module.ts +++ b/src/app/core/mainmenu/mainmenu-routing.module.ts @@ -17,7 +17,6 @@ import { RouterModule, Routes } from '@angular/router'; import { CoreMainMenuPage } from './pages/menu/menu.page'; import { CoreMainMenuMorePage } from './pages/more/more.page'; -import { CoreCoursesHomePage } from '../courses/pages/home/home.page'; const routes: Routes = [ { @@ -26,7 +25,7 @@ const routes: Routes = [ children: [ { path: 'home', // @todo: Add this route dynamically. - component: CoreCoursesHomePage, + loadChildren: () => import('../courses/pages/home/home.page.module').then( m => m.CoreCoursesHomePageModule), }, { path: 'more', diff --git a/src/app/core/settings/pages/about/about.page.module.ts b/src/app/core/settings/pages/about/about.page.module.ts new file mode 100644 index 000000000..b63096fc8 --- /dev/null +++ b/src/app/core/settings/pages/about/about.page.module.ts @@ -0,0 +1,47 @@ +// (C) Copyright 2015 Moodle Pty Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule, Routes } from '@angular/router'; +import { IonicModule } from '@ionic/angular'; +import { TranslateModule } from '@ngx-translate/core'; + +import { CoreComponentsModule } from '@components/components.module'; +import { CoreDirectivesModule } from '@directives/directives.module'; + +import { CoreSettingsAboutPage } from './about.page'; + +const routes: Routes = [ + { + path: '', + component: CoreSettingsAboutPage, + }, +]; + +@NgModule({ + imports: [ + RouterModule.forChild(routes), + CommonModule, + IonicModule, + TranslateModule.forChild(), + CoreComponentsModule, + CoreDirectivesModule, + ], + declarations: [ + CoreSettingsAboutPage, + ], + exports: [RouterModule], +}) +export class CoreSettingsAboutPageModule {} diff --git a/src/app/core/settings/pages/app/app.page.module.ts b/src/app/core/settings/pages/app/app.page.module.ts new file mode 100644 index 000000000..2a7379c5d --- /dev/null +++ b/src/app/core/settings/pages/app/app.page.module.ts @@ -0,0 +1,47 @@ +// (C) Copyright 2015 Moodle Pty Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule, Routes } from '@angular/router'; +import { IonicModule } from '@ionic/angular'; +import { TranslateModule } from '@ngx-translate/core'; + +import { CoreComponentsModule } from '@components/components.module'; +import { CoreDirectivesModule } from '@directives/directives.module'; + +import { CoreSettingsAppPage } from './app.page'; + +const routes: Routes = [ + { + path: '', + component: CoreSettingsAppPage, + }, +]; + +@NgModule({ + imports: [ + RouterModule.forChild(routes), + CommonModule, + IonicModule, + TranslateModule.forChild(), + CoreComponentsModule, + CoreDirectivesModule, + ], + declarations: [ + CoreSettingsAppPage, + ], + exports: [RouterModule], +}) +export class CoreSettingsAppPageModule {} diff --git a/src/app/core/settings/pages/app/app.page.ts b/src/app/core/settings/pages/app/app.page.ts index 8d1dac8a4..01b9fd442 100644 --- a/src/app/core/settings/pages/app/app.page.ts +++ b/src/app/core/settings/pages/app/app.page.ts @@ -20,7 +20,7 @@ import { ActivatedRoute, Params, Router } from '@angular/router'; selector: 'app-settings', templateUrl: 'app.html', }) -export class CoreAppSettingsPage { +export class CoreSettingsAppPage { // @ViewChild(CoreSplitViewComponent) splitviewCtrl?: CoreSplitViewComponent; diff --git a/src/app/core/settings/pages/deviceinfo/deviceinfo.page.module.ts b/src/app/core/settings/pages/deviceinfo/deviceinfo.page.module.ts new file mode 100644 index 000000000..e94de2f4c --- /dev/null +++ b/src/app/core/settings/pages/deviceinfo/deviceinfo.page.module.ts @@ -0,0 +1,47 @@ +// (C) Copyright 2015 Moodle Pty Ltd. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { RouterModule, Routes } from '@angular/router'; +import { IonicModule } from '@ionic/angular'; +import { TranslateModule } from '@ngx-translate/core'; + +import { CoreComponentsModule } from '@components/components.module'; +import { CoreDirectivesModule } from '@directives/directives.module'; + +import { CoreSettingsDeviceInfoPage } from './deviceinfo.page'; + +const routes: Routes = [ + { + path: '', + component: CoreSettingsDeviceInfoPage, + }, +]; + +@NgModule({ + imports: [ + RouterModule.forChild(routes), + CommonModule, + IonicModule, + TranslateModule.forChild(), + CoreComponentsModule, + CoreDirectivesModule, + ], + declarations: [ + CoreSettingsDeviceInfoPage, + ], + exports: [RouterModule], +}) +export class CoreSettingsDeviceInfoPageModule {} diff --git a/src/app/core/settings/settings-routing.module.ts b/src/app/core/settings/settings-routing.module.ts index b00808bee..a391ebf1b 100644 --- a/src/app/core/settings/settings-routing.module.ts +++ b/src/app/core/settings/settings-routing.module.ts @@ -14,22 +14,19 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CoreAppSettingsPage } from './pages/app/app.page'; -import { CoreSettingsAboutPage } from './pages/about/about.page'; -import { CoreSettingsDeviceInfoPage } from './pages/deviceinfo/deviceinfo.page'; const routes: Routes = [ { path: 'about', - component: CoreSettingsAboutPage, + loadChildren: () => import('./pages/about/about.page.module').then( m => m.CoreSettingsAboutPageModule), }, { path: 'deviceinfo', - component: CoreSettingsDeviceInfoPage, + loadChildren: () => import('./pages/deviceinfo/deviceinfo.page.module').then( m => m.CoreSettingsDeviceInfoPageModule), }, { path: 'app', - component: CoreAppSettingsPage, + loadChildren: () => import('./pages/app/app.page.module').then( m => m.CoreSettingsAppPageModule), }, { path: '', @@ -42,4 +39,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule], }) -export class CoreAppSettingsRoutingModule {} +export class CoreSettingsRoutingModule {} diff --git a/src/app/core/settings/settings.module.ts b/src/app/core/settings/settings.module.ts index 7e8f5cf66..961772eb7 100644 --- a/src/app/core/settings/settings.module.ts +++ b/src/app/core/settings/settings.module.ts @@ -13,34 +13,13 @@ // limitations under the License. import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { IonicModule } from '@ionic/angular'; -import { TranslateModule } from '@ngx-translate/core'; - -import { CoreAppSettingsRoutingModule } from './settings-routing.module'; -import { CorePipesModule } from '@pipes/pipes.module'; -import { CoreComponentsModule } from '@components/components.module'; -import { CoreDirectivesModule } from '@directives/directives.module'; - -import { CoreAppSettingsPage } from './pages/app/app.page'; -import { CoreSettingsAboutPage } from './pages/about/about.page'; -import { CoreSettingsDeviceInfoPage } from './pages/deviceinfo/deviceinfo.page'; +import { CoreSettingsRoutingModule } from './settings-routing.module'; @NgModule({ imports: [ - CommonModule, - IonicModule, - CoreAppSettingsRoutingModule, - CorePipesModule, - CoreComponentsModule, - CoreDirectivesModule, - TranslateModule.forChild(), - ], - declarations: [ - CoreAppSettingsPage, - CoreSettingsAboutPage, - CoreSettingsDeviceInfoPage, + CoreSettingsRoutingModule, ], + declarations: [], }) -export class CoreAppSettingsModule {} +export class CoreSettingsModule {}