From 988ea70e193e8aa462fc5384e64400a88b09adaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 3 Feb 2025 11:02:46 +0100 Subject: [PATCH] Pages --- .../features/comments/comments-lazy.module.ts | 34 ----------------- src/core/features/comments/comments.module.ts | 4 +- .../features/comments/pages/viewer/viewer.ts | 2 +- .../features/course/course-lazy.module.ts | 9 ++--- src/core/features/course/pages/index/index.ts | 2 +- .../pages/list-mod-type/list-mod-type.ts | 2 +- .../pages/module-preview/module-preview.ts | 2 +- .../features/course/services/course-helper.ts | 2 +- .../courses/courses-dashboard-lazy.module.ts | 32 ---------------- .../features/courses/courses-lazy.module.ts | 6 +-- .../courses/courses-my-lazy.module.ts | 4 +- src/core/features/courses/courses.module.ts | 2 +- .../courses/pages/categories/categories.ts | 2 +- .../courses/pages/dashboard/dashboard.ts | 2 +- src/core/features/courses/pages/list/list.ts | 2 +- src/core/features/courses/pages/my/my.ts | 2 +- .../dataprivacy/dataprivacy-lazy.module.ts | 33 ---------------- .../dataprivacy/dataprivacy.module.ts | 3 +- .../features/dataprivacy/pages/main/main.ts | 2 +- .../grades/grades-course-lazy.module.ts | 32 ---------------- .../grades-course-participants-lazy.module.ts | 5 +-- .../grades/grades-courses-lazy.module.ts | 11 ++---- src/core/features/grades/grades.module.ts | 6 +-- .../features/grades/pages/course/course.ts | 2 +- .../features/grades/pages/courses/courses.ts | 2 +- .../login/login-credentials-lazy.module.ts | 4 +- src/core/features/login/login-lazy.module.ts | 15 +++----- .../login/login-reconnect-lazy.module.ts | 4 +- .../pages/change-password/change-password.ts | 2 +- .../login/pages/credentials/credentials.ts | 2 +- .../login/pages/email-signup/email-signup.ts | 2 +- .../forgotten-password/forgotten-password.ts | 2 +- .../login/pages/reconnect/reconnect.ts | 2 +- src/core/features/login/pages/site/site.ts | 2 +- src/core/features/login/pages/sites/sites.ts | 2 +- .../features/login/tests/credentials.test.ts | 2 +- .../user-menu-button/user-menu-button.ts | 2 +- .../mainmenu/mainmenu-home-lazy.module.ts | 3 +- .../features/mainmenu/mainmenu-lazy.module.ts | 3 +- .../mainmenu/mainmenu-more-lazy.module.ts | 3 +- .../mainmenu/mainmenu-reload-lazy.module.ts | 34 ----------------- src/core/features/mainmenu/mainmenu.module.ts | 2 +- src/core/features/mainmenu/pages/home/home.ts | 2 +- src/core/features/mainmenu/pages/menu/menu.ts | 2 +- src/core/features/mainmenu/pages/more/more.ts | 2 +- .../features/mainmenu/pages/reload/reload.ts | 2 +- .../policy/pages/acceptances/acceptances.ts | 2 +- .../policy/pages/site-policy/site-policy.ts | 2 +- .../features/policy/policy-lazy.module.ts | 38 ------------------- src/core/features/policy/policy.module.ts | 13 ++++++- .../features/reportbuilder/pages/list/list.ts | 2 +- .../reportbuilder/pages/report/report.ts | 2 +- .../reportbuilder-lazy.module.ts | 36 ------------------ .../reportbuilder/reportbuilder.module.ts | 11 +++++- .../pages/global-search/global-search.ts | 2 +- .../features/search/search-lazy.module.ts | 3 +- .../features/settings/pages/about/about.ts | 2 +- src/core/features/settings/pages/dev/dev.ts | 2 +- .../settings/pages/deviceinfo/deviceinfo.ts | 2 +- .../settings/pages/error-log/error-log.ts | 2 +- .../settings/pages/general/general.ts | 2 +- .../features/settings/pages/index/index.ts | 2 +- .../settings/pages/licenses/licenses.ts | 2 +- src/core/features/settings/pages/site/site.ts | 2 +- .../settings/pages/space-usage/space-usage.ts | 2 +- .../pages/synchronization/synchronization.ts | 2 +- .../features/settings/settings-lazy.module.ts | 29 +++++--------- .../settings/settings-site-lazy.module.ts | 5 +-- .../pages/choose-site/choose-site.ts | 2 +- .../features/sharedfiles/pages/list/list.ts | 2 +- .../services/sharedfiles-helper.ts | 2 +- .../sharedfiles/sharedfiles-lazy.module.ts | 7 +--- .../features/sitehome/pages/index/index.ts | 2 +- .../features/sitehome/sitehome-lazy.module.ts | 32 ---------------- src/core/features/sitehome/sitehome.module.ts | 2 +- .../tag/pages/index-area/index-area.ts | 2 +- src/core/features/tag/pages/index/index.ts | 2 +- src/core/features/tag/pages/search/search.ts | 2 +- src/core/features/tag/tag-lazy.module.ts | 11 ++---- src/core/features/user/pages/about/about.ts | 2 +- .../complete-profile/complete-profile.ts | 2 +- .../user/pages/participants/participants.ts | 2 +- .../features/user/pages/profile/profile.ts | 2 +- .../features/user/user-app-lazy.module.ts | 31 --------------- .../features/user/user-course-lazy.module.ts | 5 +-- src/core/features/user/user-lazy.module.ts | 5 +-- .../features/user/user-profile-lazy.module.ts | 32 ---------------- src/core/features/user/user.module.ts | 6 +-- .../features/viewer/pages/iframe/iframe.ts | 2 +- .../features/viewer/viewer-lazy.module.ts | 31 --------------- src/core/features/viewer/viewer.module.ts | 7 +++- 91 files changed, 137 insertions(+), 520 deletions(-) delete mode 100644 src/core/features/comments/comments-lazy.module.ts delete mode 100644 src/core/features/courses/courses-dashboard-lazy.module.ts delete mode 100644 src/core/features/dataprivacy/dataprivacy-lazy.module.ts delete mode 100644 src/core/features/grades/grades-course-lazy.module.ts delete mode 100644 src/core/features/mainmenu/mainmenu-reload-lazy.module.ts delete mode 100644 src/core/features/policy/policy-lazy.module.ts delete mode 100644 src/core/features/reportbuilder/reportbuilder-lazy.module.ts delete mode 100644 src/core/features/sitehome/sitehome-lazy.module.ts delete mode 100644 src/core/features/user/user-app-lazy.module.ts delete mode 100644 src/core/features/user/user-profile-lazy.module.ts delete mode 100644 src/core/features/viewer/viewer-lazy.module.ts diff --git a/src/core/features/comments/comments-lazy.module.ts b/src/core/features/comments/comments-lazy.module.ts deleted file mode 100644 index 7233a33425b..00000000000 --- a/src/core/features/comments/comments-lazy.module.ts +++ /dev/null @@ -1,34 +0,0 @@ -// (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 { CoreSharedModule } from '@/core/shared.module'; -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; -import { CoreCommentsViewerPage } from '@features/comments/pages/viewer/viewer'; - -const routes: Routes = [ - { - path: ':contextLevel/:instanceId/:componentName/:itemId', - component: CoreCommentsViewerPage, - }, -]; - -@NgModule({ - imports: [ - RouterModule.forChild(routes), - CoreSharedModule, - CoreCommentsViewerPage, - ], -}) -export default class CoreCommentsLazyModule {} diff --git a/src/core/features/comments/comments.module.ts b/src/core/features/comments/comments.module.ts index 870882d9c2d..2c8cd0dc322 100644 --- a/src/core/features/comments/comments.module.ts +++ b/src/core/features/comments/comments.module.ts @@ -40,8 +40,8 @@ export async function getCommentsServices(): Promise[]> { const routes: Routes = [ { - path: 'comments', - loadChildren: () => import('@features/comments/comments-lazy.module'), + path: 'comments/:contextLevel/:instanceId/:componentName/:itemId', + loadComponent: () => import('@features/comments/pages/viewer/viewer'), }, ]; diff --git a/src/core/features/comments/pages/viewer/viewer.ts b/src/core/features/comments/pages/viewer/viewer.ts index b2cd332b22e..3e027cbe955 100644 --- a/src/core/features/comments/pages/viewer/viewer.ts +++ b/src/core/features/comments/pages/viewer/viewer.ts @@ -61,7 +61,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterViewInit { +export default class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterViewInit { @ViewChild(IonContent) content?: IonContent; diff --git a/src/core/features/course/course-lazy.module.ts b/src/core/features/course/course-lazy.module.ts index cde9d8aee07..37591ca5946 100644 --- a/src/core/features/course/course-lazy.module.ts +++ b/src/core/features/course/course-lazy.module.ts @@ -15,9 +15,6 @@ import { Injector, NgModule } from '@angular/core'; import { ROUTES, Routes } from '@angular/router'; import { resolveIndexRoutes } from '@features/course/course-routing.module'; -import { CoreCourseIndexPage } from '@features/course/pages/index'; -import { CoreCourseListModTypePage } from '@features/course/pages/list-mod-type/list-mod-type'; -import { CoreCourseModulePreviewPage } from '@features/course/pages/module-preview/module-preview'; import { CoreCourseHelper } from './services/course-helper'; import { CORE_COURSE_INDEX_PATH } from './constants'; @@ -36,7 +33,7 @@ function buildRoutes(injector: Injector): Routes { children: [ { path: '', - component: CoreCourseIndexPage, + loadComponent: () => import('@features/course/pages/index/index'), data: { isCourseIndex: true, }, @@ -47,11 +44,11 @@ function buildRoutes(injector: Injector): Routes { }, { path: ':courseId/:cmId/module-preview', - component: CoreCourseModulePreviewPage, + loadComponent: () => import('@features/course/pages/module-preview/module-preview'), }, { path: ':courseId/list-mod-type', - component: CoreCourseListModTypePage, + loadComponent: () => import('@features/course/pages/list-mod-type/list-mod-type'), }, { path: ':courseId/summary', diff --git a/src/core/features/course/pages/index/index.ts b/src/core/features/course/pages/index/index.ts index aed927da953..cd73c7c3b1e 100644 --- a/src/core/features/course/pages/index/index.ts +++ b/src/core/features/course/pages/index/index.ts @@ -45,7 +45,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreCourseIndexPage implements OnInit, OnDestroy { +export default class CoreCourseIndexPage implements OnInit, OnDestroy { @ViewChild(CoreTabsOutletComponent) tabsComponent?: CoreTabsOutletComponent; @ViewChild('courseThumb') courseThumb?: ElementRef; diff --git a/src/core/features/course/pages/list-mod-type/list-mod-type.ts b/src/core/features/course/pages/list-mod-type/list-mod-type.ts index c52e5aa8764..f9d5ad3085d 100644 --- a/src/core/features/course/pages/list-mod-type/list-mod-type.ts +++ b/src/core/features/course/pages/list-mod-type/list-mod-type.ts @@ -42,7 +42,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreCourseModuleComponent, ], }) -export class CoreCourseListModTypePage implements OnInit { +export default class CoreCourseListModTypePage implements OnInit { private static readonly PAGE_LENGTH = 10; // How many activities should load each time showMoreActivities is called. diff --git a/src/core/features/course/pages/module-preview/module-preview.ts b/src/core/features/course/pages/module-preview/module-preview.ts index 447fb6f11fb..ade36d73d8b 100644 --- a/src/core/features/course/pages/module-preview/module-preview.ts +++ b/src/core/features/course/pages/module-preview/module-preview.ts @@ -42,7 +42,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreCourseModuleNavigationComponent, ], }) -export class CoreCourseModulePreviewPage implements OnInit { +export default class CoreCourseModulePreviewPage implements OnInit { title!: string; module!: CoreCourseModuleData; diff --git a/src/core/features/course/services/course-helper.ts b/src/core/features/course/services/course-helper.ts index 21a6b6cd482..4f51e2636e8 100644 --- a/src/core/features/course/services/course-helper.ts +++ b/src/core/features/course/services/course-helper.ts @@ -1981,7 +1981,7 @@ export class CoreCourseHelperProvider { * @param course Course selected */ async openCourseSummary(course: CoreCourseWithImageAndColor & CoreCourseAnyCourseData): Promise { - const { CoreCourseSummaryPage } = await import('../pages/course-summary/course-summary'); + const { CoreCourseSummaryPage } = await import('@features/course/pages/course-summary/course-summary'); CoreModals.openSideModal({ component: CoreCourseSummaryPage, diff --git a/src/core/features/courses/courses-dashboard-lazy.module.ts b/src/core/features/courses/courses-dashboard-lazy.module.ts deleted file mode 100644 index 70aa63fb435..00000000000 --- a/src/core/features/courses/courses-dashboard-lazy.module.ts +++ /dev/null @@ -1,32 +0,0 @@ -// (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 { CoreCoursesDashboardPage } from '@features/courses/pages/dashboard/dashboard'; - -const routes: Routes = [ - { - path: '', - component: CoreCoursesDashboardPage, - }, -]; - -@NgModule({ - imports: [ - RouterModule.forChild(routes), - ], -}) -export default class CoreCoursesDashboardLazyModule {} diff --git a/src/core/features/courses/courses-lazy.module.ts b/src/core/features/courses/courses-lazy.module.ts index 9cbab3e514a..a000755da81 100644 --- a/src/core/features/courses/courses-lazy.module.ts +++ b/src/core/features/courses/courses-lazy.module.ts @@ -14,8 +14,6 @@ import { Injector, NgModule } from '@angular/core'; import { ROUTES, Routes } from '@angular/router'; -import { CoreCoursesCategoriesPage } from '@features/courses/pages/categories/categories'; -import { CoreCoursesListPage } from '@features/courses/pages/list/list'; import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module'; import { CoreCoursesHelper } from './services/courses-helper'; import { CoreCoursesMyCoursesMainMenuHandlerService } from './services/handlers/my-courses-mainmenu'; @@ -42,11 +40,11 @@ function buildRoutes(injector: Injector): Routes { }, { path: 'categories/:id', - component: CoreCoursesCategoriesPage, + loadComponent: () => import('@features/courses/pages/categories/categories'), }, { path: 'list', - component: CoreCoursesListPage, + loadComponent: () => import('@features/courses/pages/list/list'), }, ...buildTabMainRoutes(injector, { redirectTo: 'my', diff --git a/src/core/features/courses/courses-my-lazy.module.ts b/src/core/features/courses/courses-my-lazy.module.ts index 598e8517c6e..769840d33c0 100644 --- a/src/core/features/courses/courses-my-lazy.module.ts +++ b/src/core/features/courses/courses-my-lazy.module.ts @@ -15,12 +15,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CoreCoursesMyPage } from '@features/courses/pages/my/my'; - const routes: Routes = [ { path: '', - component: CoreCoursesMyPage, + loadComponent: () => import('@features/courses/pages/my/my'), }, ]; diff --git a/src/core/features/courses/courses.module.ts b/src/core/features/courses/courses.module.ts index 0b06ad7f58c..ba6c92ff015 100644 --- a/src/core/features/courses/courses.module.ts +++ b/src/core/features/courses/courses.module.ts @@ -91,7 +91,7 @@ export async function getCoursesExportedObjects(): Promise import('./courses-dashboard-lazy.module'), + loadComponent: () => import('@features/courses/pages/dashboard/dashboard'), }, ]; diff --git a/src/core/features/courses/pages/categories/categories.ts b/src/core/features/courses/pages/categories/categories.ts index c75f07b3ecf..486c91d0989 100644 --- a/src/core/features/courses/pages/categories/categories.ts +++ b/src/core/features/courses/pages/categories/categories.ts @@ -42,7 +42,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreCoursesCourseListItemComponent, ], }) -export class CoreCoursesCategoriesPage implements OnInit, OnDestroy { +export default class CoreCoursesCategoriesPage implements OnInit, OnDestroy { title: string; currentCategory?: CoreCategoryData; diff --git a/src/core/features/courses/pages/dashboard/dashboard.ts b/src/core/features/courses/pages/dashboard/dashboard.ts index c3def2bbb40..3a629fbdb70 100644 --- a/src/core/features/courses/pages/dashboard/dashboard.ts +++ b/src/core/features/courses/pages/dashboard/dashboard.ts @@ -43,7 +43,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreBlockSideBlocksButtonComponent, ], }) -export class CoreCoursesDashboardPage implements OnInit, OnDestroy { +export default class CoreCoursesDashboardPage implements OnInit, OnDestroy { @ViewChildren(CoreBlockComponent) blocksComponents?: QueryList; diff --git a/src/core/features/courses/pages/list/list.ts b/src/core/features/courses/pages/list/list.ts index ea3bf8c44db..a0ee057292b 100644 --- a/src/core/features/courses/pages/list/list.ts +++ b/src/core/features/courses/pages/list/list.ts @@ -48,7 +48,7 @@ type CoreCoursesListMode = 'search' | 'all' | 'my'; CoreCoursesCourseListItemComponent, ], }) -export class CoreCoursesListPage implements OnInit, OnDestroy { +export default class CoreCoursesListPage implements OnInit, OnDestroy { downloadAllCoursesEnabled = false; diff --git a/src/core/features/courses/pages/my/my.ts b/src/core/features/courses/pages/my/my.ts index effd343da3e..e0021c7a974 100644 --- a/src/core/features/courses/pages/my/my.ts +++ b/src/core/features/courses/pages/my/my.ts @@ -56,7 +56,7 @@ import { CoreBlockSideBlocksButtonComponent } from '../../../block/components/si CoreBlockSideBlocksButtonComponent, ], }) -export class CoreCoursesMyPage implements OnInit, OnDestroy, AsyncDirective { +export default class CoreCoursesMyPage implements OnInit, OnDestroy, AsyncDirective { @ViewChild(CoreBlockComponent) block!: CoreBlockComponent; diff --git a/src/core/features/dataprivacy/dataprivacy-lazy.module.ts b/src/core/features/dataprivacy/dataprivacy-lazy.module.ts deleted file mode 100644 index 834e5a51093..00000000000 --- a/src/core/features/dataprivacy/dataprivacy-lazy.module.ts +++ /dev/null @@ -1,33 +0,0 @@ -// (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 { CoreDataPrivacyMainPage } from './pages/main/main'; - -const routes: Routes = [ - { - path: '', - pathMatch: 'full', - component: CoreDataPrivacyMainPage, - }, -]; - -@NgModule({ - imports: [ - RouterModule.forChild(routes), - ], -}) -export default class CoreDataPrivacyLazyModule {} diff --git a/src/core/features/dataprivacy/dataprivacy.module.ts b/src/core/features/dataprivacy/dataprivacy.module.ts index 75e9e7de5fa..9e6254390ad 100644 --- a/src/core/features/dataprivacy/dataprivacy.module.ts +++ b/src/core/features/dataprivacy/dataprivacy.module.ts @@ -25,7 +25,8 @@ import { CoreDataPrivacyCreateDataRequestLinkHandler } from './services/handlers const routes: Routes = [ { path: CORE_DATAPRIVACY_PAGE_NAME, - loadChildren: () => import('./dataprivacy-lazy.module'), + pathMatch: 'full', + loadComponent: () => import('@features/dataprivacy/pages/main/main'), }, ]; diff --git a/src/core/features/dataprivacy/pages/main/main.ts b/src/core/features/dataprivacy/pages/main/main.ts index 45e4cb2b727..381c613ecdc 100644 --- a/src/core/features/dataprivacy/pages/main/main.ts +++ b/src/core/features/dataprivacy/pages/main/main.ts @@ -41,7 +41,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreDataPrivacyMainPage implements OnInit { +export default class CoreDataPrivacyMainPage implements OnInit { accessInfo?: CoreDataPrivacyGetAccessInformationWSResponse; requests: CoreDataPrivacyRequestToDisplay[] = []; diff --git a/src/core/features/grades/grades-course-lazy.module.ts b/src/core/features/grades/grades-course-lazy.module.ts deleted file mode 100644 index 86cf6ece81b..00000000000 --- a/src/core/features/grades/grades-course-lazy.module.ts +++ /dev/null @@ -1,32 +0,0 @@ -// (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 { CoreGradesCoursePage } from './pages/course/course'; - -const routes: Routes = [ - { - path: '', - component: CoreGradesCoursePage, - }, -]; - -@NgModule({ - imports: [ - RouterModule.forChild(routes), - ], -}) -export default class CoreGradesCourseLazyModule {} diff --git a/src/core/features/grades/grades-course-participants-lazy.module.ts b/src/core/features/grades/grades-course-participants-lazy.module.ts index b06c860ffdf..859b2acf49a 100644 --- a/src/core/features/grades/grades-course-participants-lazy.module.ts +++ b/src/core/features/grades/grades-course-participants-lazy.module.ts @@ -16,17 +16,16 @@ import { conditionalRoutes } from '@/app/app-routing.module'; import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CoreUserParticipantsPage } from '@features/user/pages/participants/participants'; import { CoreScreen } from '@services/screen'; const routes: Routes = [ { path: '', - component: CoreUserParticipantsPage, + loadComponent: () => import('@features/user/pages/participants/participants'), children: conditionalRoutes([ { path: ':userId', - loadChildren: () => import('./grades-course-lazy.module'), + loadComponent: () => import('@features/grades/pages/course/course'), data: { swipeManagerSource: 'participants' }, }, ], () => CoreScreen.isTablet), diff --git a/src/core/features/grades/grades-courses-lazy.module.ts b/src/core/features/grades/grades-courses-lazy.module.ts index e959604fdc6..9c3d041f54b 100644 --- a/src/core/features/grades/grades-courses-lazy.module.ts +++ b/src/core/features/grades/grades-courses-lazy.module.ts @@ -18,28 +18,25 @@ import { RouterModule, Routes } from '@angular/router'; import { conditionalRoutes } from '@/app/app-routing.module'; import { CoreScreen } from '@services/screen'; -import { CoreGradesCoursePage } from './pages/course/course'; -import { CoreGradesCoursesPage } from './pages/courses/courses'; - const mobileRoutes: Routes = [ { path: '', - component: CoreGradesCoursesPage, + loadComponent: () => import('@features/grades/pages/courses/courses'), }, { path: ':courseId', - component: CoreGradesCoursePage, + loadComponent: () => import('@features/grades/pages/course/course'), }, ]; const tabletRoutes: Routes = [ { path: '', - component: CoreGradesCoursesPage, + loadComponent: () => import('@features/grades/pages/courses/courses'), children: [ { path: ':courseId', - component: CoreGradesCoursePage, + loadComponent: () => import('@features/grades/pages/course/course'), }, ], }, diff --git a/src/core/features/grades/grades.module.ts b/src/core/features/grades/grades.module.ts index 40527316fa3..5634fbd1d39 100644 --- a/src/core/features/grades/grades.module.ts +++ b/src/core/features/grades/grades.module.ts @@ -54,12 +54,12 @@ const mainMenuChildrenRoutes: Routes = [ }, { path: `${CORE_COURSE_PAGE_NAME}/:courseId/${PARTICIPANTS_PAGE_NAME}/:userId/${GRADES_PAGE_NAME}`, - loadChildren: () => import('./grades-course-lazy.module'), + loadComponent: () => import('@features/grades/pages/course/course'), }, ...conditionalRoutes([ { path: `${CORE_COURSE_PAGE_NAME}/${CORE_COURSE_INDEX_PATH}/${GRADES_PARTICIPANTS_PAGE_NAME}/:userId`, - loadChildren: () => import('./grades-course-lazy.module'), + loadComponent: () => import('@features/grades/pages/course/course'), data: { swipeManagerSource: 'participants' }, }, ], () => CoreScreen.isMobile), @@ -68,7 +68,7 @@ const mainMenuChildrenRoutes: Routes = [ const courseIndexRoutes: Routes = [ { path: GRADES_PAGE_NAME, - loadChildren: () => import('./grades-course-lazy.module'), + loadComponent: () => import('@features/grades/pages/course/course'), }, { path: GRADES_PARTICIPANTS_PAGE_NAME, diff --git a/src/core/features/grades/pages/course/course.ts b/src/core/features/grades/pages/course/course.ts index 38702085fd2..fb56143f2a9 100644 --- a/src/core/features/grades/pages/course/course.ts +++ b/src/core/features/grades/pages/course/course.ts @@ -49,7 +49,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreGradesCoursePage implements AfterViewInit, OnDestroy { +export default class CoreGradesCoursePage implements AfterViewInit, OnDestroy { courseId!: number; userId!: number; diff --git a/src/core/features/grades/pages/courses/courses.ts b/src/core/features/grades/pages/courses/courses.ts index 5e4d7dccba1..3e427492174 100644 --- a/src/core/features/grades/pages/courses/courses.ts +++ b/src/core/features/grades/pages/courses/courses.ts @@ -37,7 +37,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreGradesCoursesPage implements OnDestroy, AfterViewInit { +export default class CoreGradesCoursesPage implements OnDestroy, AfterViewInit { courses: CoreGradesCoursesManager; diff --git a/src/core/features/login/login-credentials-lazy.module.ts b/src/core/features/login/login-credentials-lazy.module.ts index 15032b1e5c5..920ab6487bf 100644 --- a/src/core/features/login/login-credentials-lazy.module.ts +++ b/src/core/features/login/login-credentials-lazy.module.ts @@ -15,12 +15,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CoreLoginCredentialsPage } from '@features/login/pages/credentials/credentials'; - const routes: Routes = [ { path: '', - component: CoreLoginCredentialsPage, + loadComponent: () => import('@features/login/pages/credentials/credentials'), }, ]; diff --git a/src/core/features/login/login-lazy.module.ts b/src/core/features/login/login-lazy.module.ts index 668f01731c5..9fefe48eb10 100644 --- a/src/core/features/login/login-lazy.module.ts +++ b/src/core/features/login/login-lazy.module.ts @@ -17,11 +17,6 @@ import { RouterModule, Routes } from '@angular/router'; import { hasSitesGuard } from './guards/has-sites'; import { CoreLoginHelper } from './services/login-helper'; -import { CoreLoginForgottenPasswordPage } from '@features/login/pages/forgotten-password/forgotten-password'; -import { CoreLoginEmailSignupPage } from '@features/login/pages/email-signup/email-signup'; -import { CoreLoginSitePage } from '@features/login/pages/site/site'; -import { CoreLoginSitesPage } from '@features/login/pages/sites/sites'; -import { CoreLoginChangePasswordPage } from '@features/login/pages/change-password/change-password'; const routes: Routes = [ { @@ -31,7 +26,7 @@ const routes: Routes = [ }, { path: 'site', - component: CoreLoginSitePage, + loadComponent: () => import('@features/login/pages/site/site'), }, { path: 'credentials', @@ -39,20 +34,20 @@ const routes: Routes = [ }, { path: 'sites', - component: CoreLoginSitesPage, + loadComponent: () => import('@features/login/pages/sites/sites'), canActivate: [hasSitesGuard], }, { path: 'forgottenpassword', - component: CoreLoginForgottenPasswordPage, + loadComponent: () => import('@features/login/pages/forgotten-password/forgotten-password'), }, { path: 'changepassword', - component: CoreLoginChangePasswordPage, + loadComponent: () => import('@features/login/pages/change-password/change-password'), }, { path: 'emailsignup', - component: CoreLoginEmailSignupPage, + loadComponent: () => import('@features/login/pages/email-signup/email-signup'), }, { path: 'reconnect', diff --git a/src/core/features/login/login-reconnect-lazy.module.ts b/src/core/features/login/login-reconnect-lazy.module.ts index e51d8b6b0ba..acf00c020c8 100644 --- a/src/core/features/login/login-reconnect-lazy.module.ts +++ b/src/core/features/login/login-reconnect-lazy.module.ts @@ -15,12 +15,10 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CoreLoginReconnectPage } from '@features/login/pages/reconnect/reconnect'; - const routes: Routes = [ { path: '', - component: CoreLoginReconnectPage, + loadComponent: () => import('@features/login/pages/reconnect/reconnect'), }, ]; diff --git a/src/core/features/login/pages/change-password/change-password.ts b/src/core/features/login/pages/change-password/change-password.ts index 51fba73d45f..5819fff4309 100644 --- a/src/core/features/login/pages/change-password/change-password.ts +++ b/src/core/features/login/pages/change-password/change-password.ts @@ -34,7 +34,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreLoginChangePasswordPage implements OnDestroy { +export default class CoreLoginChangePasswordPage implements OnDestroy { changingPassword = false; logoutLabel: string; diff --git a/src/core/features/login/pages/credentials/credentials.ts b/src/core/features/login/pages/credentials/credentials.ts index 6f367a41d30..754836f6743 100644 --- a/src/core/features/login/pages/credentials/credentials.ts +++ b/src/core/features/login/pages/credentials/credentials.ts @@ -62,7 +62,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreLoginMethodsComponent, ], }) -export class CoreLoginCredentialsPage implements OnInit, OnDestroy { +export default class CoreLoginCredentialsPage implements OnInit, OnDestroy { @ViewChild('credentialsForm') formElement?: ElementRef; diff --git a/src/core/features/login/pages/email-signup/email-signup.ts b/src/core/features/login/pages/email-signup/email-signup.ts index 3a214837f84..686b0f9388f 100644 --- a/src/core/features/login/pages/email-signup/email-signup.ts +++ b/src/core/features/login/pages/email-signup/email-signup.ts @@ -55,7 +55,7 @@ import { CoreUserProfileFieldComponent } from '@features/user/components/user-pr CoreUserProfileFieldComponent, ], }) -export class CoreLoginEmailSignupPage implements OnInit { +export default class CoreLoginEmailSignupPage implements OnInit { // Accept A-Z in strict chars pattern to be able to differentiate it from the lowercase pattern. protected static readonly USERNAME_STRICT_CHARS_PATTERN = '^[A-Z-.@_a-z0-9]*$'; diff --git a/src/core/features/login/pages/forgotten-password/forgotten-password.ts b/src/core/features/login/pages/forgotten-password/forgotten-password.ts index be7df5e0deb..2159b77b258 100644 --- a/src/core/features/login/pages/forgotten-password/forgotten-password.ts +++ b/src/core/features/login/pages/forgotten-password/forgotten-password.ts @@ -40,7 +40,7 @@ import { CoreLoginExceededAttemptsComponent } from '../../components/exceeded-at CoreLoginExceededAttemptsComponent, ], }) -export class CoreLoginForgottenPasswordPage implements OnInit { +export default class CoreLoginForgottenPasswordPage implements OnInit { @ViewChild('resetPasswordForm') formElement?: ElementRef; diff --git a/src/core/features/login/pages/reconnect/reconnect.ts b/src/core/features/login/pages/reconnect/reconnect.ts index d1c0298e8e8..7e707dbea2a 100644 --- a/src/core/features/login/pages/reconnect/reconnect.ts +++ b/src/core/features/login/pages/reconnect/reconnect.ts @@ -56,7 +56,7 @@ import { CoreLoginIdentityProviderComponent } from '../../components/identity-pr CoreLoginMethodsComponent, ], }) -export class CoreLoginReconnectPage implements OnInit, OnDestroy { +export default class CoreLoginReconnectPage implements OnInit, OnDestroy { @ViewChild('reconnectForm') formElement?: ElementRef; @ViewChild(CoreLoginMethodsComponent) set loginMethods(loginMethods: CoreLoginMethodsComponent) { diff --git a/src/core/features/login/pages/site/site.ts b/src/core/features/login/pages/site/site.ts index 03026840335..fdab5a03456 100644 --- a/src/core/features/login/pages/site/site.ts +++ b/src/core/features/login/pages/site/site.ts @@ -65,7 +65,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreLoginSitePage implements OnInit { +export default class CoreLoginSitePage implements OnInit { @ViewChild('siteFormEl') formElement?: ElementRef; diff --git a/src/core/features/login/pages/sites/sites.ts b/src/core/features/login/pages/sites/sites.ts index 0ee7470af21..7c3c89a7a31 100644 --- a/src/core/features/login/pages/sites/sites.ts +++ b/src/core/features/login/pages/sites/sites.ts @@ -35,7 +35,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreLoginSitesPage implements OnInit { +export default class CoreLoginSitesPage implements OnInit { accountsList: CoreAccountsList = { sameSite: [], diff --git a/src/core/features/login/tests/credentials.test.ts b/src/core/features/login/tests/credentials.test.ts index 3e18eb709f1..c27ac78c8de 100644 --- a/src/core/features/login/tests/credentials.test.ts +++ b/src/core/features/login/tests/credentials.test.ts @@ -15,7 +15,7 @@ import { CoreSharedModule } from '@/core/shared.module'; import { findElement, mock, mockSingleton, renderPageComponent, requireElement } from '@/testing/utils'; import { CoreLoginError } from '@classes/errors/loginerror'; -import { CoreLoginCredentialsPage } from '@features/login/pages/credentials/credentials'; +import CoreLoginCredentialsPage from '@features/login/pages/credentials/credentials'; import { CoreLang } from '@services/lang'; import { CoreSites } from '@services/sites'; import { Http } from '@singletons'; diff --git a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts index 7d384989354..e09c6657da0 100644 --- a/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts +++ b/src/core/features/mainmenu/components/user-menu-button/user-menu-button.ts @@ -21,7 +21,7 @@ import { CoreScreen } from '@services/screen'; import { CoreSites } from '@services/sites'; import { CoreModals } from '@services/overlays/modals'; import { CoreMainMenuUserMenuTourComponent } from '../user-menu-tour/user-menu-tour'; -import { CoreMainMenuPage } from '@features/mainmenu/pages/menu/menu'; +import CoreMainMenuPage from '@features/mainmenu/pages/menu/menu'; import { toBoolean } from '@/core/transforms/boolean'; import { CoreSharedModule } from '@/core/shared.module'; diff --git a/src/core/features/mainmenu/mainmenu-home-lazy.module.ts b/src/core/features/mainmenu/mainmenu-home-lazy.module.ts index f7423137053..d02eee6f0f3 100644 --- a/src/core/features/mainmenu/mainmenu-home-lazy.module.ts +++ b/src/core/features/mainmenu/mainmenu-home-lazy.module.ts @@ -18,7 +18,6 @@ import { ROUTES, Routes } from '@angular/router'; import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module'; import { CoreMainMenuHomeHandlerService } from '@features/mainmenu/services/handlers/mainmenu'; import { resolveHomeRoutes } from '@features/mainmenu/mainmenu-home-routing.module'; -import { CoreMainMenuHomePage } from '@features/mainmenu/pages/home/home'; /** * Build module routes. @@ -35,7 +34,7 @@ function buildRoutes(injector: Injector): Routes { data: { mainMenuTabRoot: CoreMainMenuHomeHandlerService.PAGE_NAME, }, - component: CoreMainMenuHomePage, + loadComponent: () => import('@features/mainmenu/pages/home/home'), children: routes.children, }), ...routes.siblings, diff --git a/src/core/features/mainmenu/mainmenu-lazy.module.ts b/src/core/features/mainmenu/mainmenu-lazy.module.ts index 8804875c750..6935d73291e 100644 --- a/src/core/features/mainmenu/mainmenu-lazy.module.ts +++ b/src/core/features/mainmenu/mainmenu-lazy.module.ts @@ -16,7 +16,6 @@ import { Injector, NgModule } from '@angular/core'; import { ROUTES, Routes } from '@angular/router'; import { resolveMainMenuRoutes } from './mainmenu-routing.module'; -import { CoreMainMenuPage } from './pages/menu/menu'; import { CoreMainMenuHomeHandlerService } from './services/handlers/mainmenu'; import { MAIN_MENU_MORE_PAGE_NAME } from './constants'; @@ -32,7 +31,7 @@ function buildRoutes(injector: Injector): Routes { return [ { path: '', - component: CoreMainMenuPage, + loadComponent: () => import('@features/mainmenu/pages/menu/menu'), children: [ { path: CoreMainMenuHomeHandlerService.PAGE_NAME, diff --git a/src/core/features/mainmenu/mainmenu-more-lazy.module.ts b/src/core/features/mainmenu/mainmenu-more-lazy.module.ts index 3072cdd0602..f8087df8e0d 100644 --- a/src/core/features/mainmenu/mainmenu-more-lazy.module.ts +++ b/src/core/features/mainmenu/mainmenu-more-lazy.module.ts @@ -16,7 +16,6 @@ import { Injector, NgModule } from '@angular/core'; import { Routes, ROUTES } from '@angular/router'; import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module'; -import { CoreMainMenuMorePage } from '@features/mainmenu/pages/more/more'; import { MAIN_MENU_MORE_PAGE_NAME } from './constants'; /** @@ -27,7 +26,7 @@ import { MAIN_MENU_MORE_PAGE_NAME } from './constants'; */ function buildRoutes(injector: Injector): Routes { return buildTabMainRoutes(injector, { - component: CoreMainMenuMorePage, + loadComponent: () => import('@features/mainmenu/pages/more/more'), data: { mainMenuTabRoot: MAIN_MENU_MORE_PAGE_NAME, }, diff --git a/src/core/features/mainmenu/mainmenu-reload-lazy.module.ts b/src/core/features/mainmenu/mainmenu-reload-lazy.module.ts deleted file mode 100644 index b2bbcf084c6..00000000000 --- a/src/core/features/mainmenu/mainmenu-reload-lazy.module.ts +++ /dev/null @@ -1,34 +0,0 @@ -// (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 { CoreSharedModule } from '@/core/shared.module'; -import { CoreMainMenuReloadPage } from '@features/mainmenu/pages/reload/reload'; - -const routes: Routes = [ - { - path: '', - component: CoreMainMenuReloadPage, - }, -]; - -@NgModule({ - imports: [ - RouterModule.forChild(routes), - CoreSharedModule, - CoreMainMenuReloadPage, - ], -}) -export default class CoreMainMenuReloadLazyModule {} diff --git a/src/core/features/mainmenu/mainmenu.module.ts b/src/core/features/mainmenu/mainmenu.module.ts index fa4e0354bef..730bd26ef3b 100644 --- a/src/core/features/mainmenu/mainmenu.module.ts +++ b/src/core/features/mainmenu/mainmenu.module.ts @@ -77,7 +77,7 @@ const appRoutes: Routes = [ }, { path: 'reload', - loadChildren: () => import('./mainmenu-reload-lazy.module'), + loadComponent: () => import('@features/mainmenu/pages/reload/reload'), }, ]; diff --git a/src/core/features/mainmenu/pages/home/home.ts b/src/core/features/mainmenu/pages/home/home.ts index e9e80794e1d..5ebcc0f4515 100644 --- a/src/core/features/mainmenu/pages/home/home.ts +++ b/src/core/features/mainmenu/pages/home/home.ts @@ -38,7 +38,7 @@ import { CoreMainMenuUserButtonComponent } from '../../components/user-menu-butt CoreMainMenuUserButtonComponent, ], }) -export class CoreMainMenuHomePage implements OnInit { +export default class CoreMainMenuHomePage implements OnInit { @ViewChild(CoreTabsOutletComponent) tabsComponent?: CoreTabsOutletComponent; diff --git a/src/core/features/mainmenu/pages/menu/menu.ts b/src/core/features/mainmenu/pages/menu/menu.ts index 4fb394f3a2a..e1d0ae8eeab 100644 --- a/src/core/features/mainmenu/pages/menu/menu.ts +++ b/src/core/features/mainmenu/pages/menu/menu.ts @@ -78,7 +78,7 @@ const ANIMATION_DURATION = 500; CoreMainMenuUserButtonComponent, ], }) -export class CoreMainMenuPage implements OnInit, OnDestroy { +export default class CoreMainMenuPage implements OnInit, OnDestroy { tabs: CoreMainMenuHandlerToDisplay[] = []; allHandlers?: CoreMainMenuHandlerToDisplay[]; diff --git a/src/core/features/mainmenu/pages/more/more.ts b/src/core/features/mainmenu/pages/more/more.ts index e9454431629..99d613f951a 100644 --- a/src/core/features/mainmenu/pages/more/more.ts +++ b/src/core/features/mainmenu/pages/more/more.ts @@ -40,7 +40,7 @@ import { CoreMainMenuUserButtonComponent } from '../../components/user-menu-butt CoreMainMenuUserButtonComponent, ], }) -export class CoreMainMenuMorePage implements OnInit, OnDestroy { +export default class CoreMainMenuMorePage implements OnInit, OnDestroy { handlers?: CoreMainMenuHandlerData[]; handlersLoaded = false; diff --git a/src/core/features/mainmenu/pages/reload/reload.ts b/src/core/features/mainmenu/pages/reload/reload.ts index fcf9a24e60f..e80beb56f01 100644 --- a/src/core/features/mainmenu/pages/reload/reload.ts +++ b/src/core/features/mainmenu/pages/reload/reload.ts @@ -27,7 +27,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreMainMenuReloadPage implements OnInit { +export default class CoreMainMenuReloadPage implements OnInit { /** * @inheritdoc diff --git a/src/core/features/policy/pages/acceptances/acceptances.ts b/src/core/features/policy/pages/acceptances/acceptances.ts index 6d29b0ffa15..24429ee225e 100644 --- a/src/core/features/policy/pages/acceptances/acceptances.ts +++ b/src/core/features/policy/pages/acceptances/acceptances.ts @@ -42,7 +42,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CorePolicyAcceptancesPage implements OnInit, OnDestroy { +export default class CorePolicyAcceptancesPage implements OnInit, OnDestroy { dataLoaded = false; policies: ActiveSitePolicy[] = []; diff --git a/src/core/features/policy/pages/site-policy/site-policy.ts b/src/core/features/policy/pages/site-policy/site-policy.ts index 99da86c6000..a260110585e 100644 --- a/src/core/features/policy/pages/site-policy/site-policy.ts +++ b/src/core/features/policy/pages/site-policy/site-policy.ts @@ -47,7 +47,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CorePolicySitePolicyPage implements OnInit, OnDestroy { +export default class CorePolicySitePolicyPage implements OnInit, OnDestroy { @ViewChild(IonContent) content?: IonContent; diff --git a/src/core/features/policy/policy-lazy.module.ts b/src/core/features/policy/policy-lazy.module.ts deleted file mode 100644 index 6b450c98cac..00000000000 --- a/src/core/features/policy/policy-lazy.module.ts +++ /dev/null @@ -1,38 +0,0 @@ -// (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 { CorePolicySitePolicyPage } from '@features/policy/pages/site-policy/site-policy'; -import { ACCEPTANCES_PAGE_NAME, SITE_POLICY_PAGE_NAME } from './constants'; -import { CorePolicyAcceptancesPage } from './pages/acceptances/acceptances'; - -const routes: Routes = [ - { - path: SITE_POLICY_PAGE_NAME, - component: CorePolicySitePolicyPage, - }, - { - path: ACCEPTANCES_PAGE_NAME, - component: CorePolicyAcceptancesPage, - }, -]; - -@NgModule({ - imports: [ - RouterModule.forChild(routes), - ], -}) -export default class CorePolicyLazyModule {} diff --git a/src/core/features/policy/policy.module.ts b/src/core/features/policy/policy.module.ts index 9750842f3f6..ce996683f13 100644 --- a/src/core/features/policy/policy.module.ts +++ b/src/core/features/policy/policy.module.ts @@ -17,7 +17,7 @@ import { Routes } from '@angular/router'; import { AppRoutingModule } from '@/app/app-routing.module'; import { CoreEvents } from '@singletons/events'; -import { POLICY_PAGE_NAME } from './constants'; +import { ACCEPTANCES_PAGE_NAME, POLICY_PAGE_NAME, SITE_POLICY_PAGE_NAME } from './constants'; import { CoreUserDelegate } from '@features/user/services/user-delegate'; import { CorePolicyUserHandler } from './services/handlers/user'; import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-routing.module'; @@ -27,7 +27,16 @@ import { CoreContentLinksDelegate } from '@features/contentlinks/services/conten const routes: Routes = [ { path: POLICY_PAGE_NAME, - loadChildren: () => import('./policy-lazy.module'), + children: [ + { + path: SITE_POLICY_PAGE_NAME, + loadComponent: () => import('@features/policy/pages/site-policy/site-policy'), + }, + { + path: ACCEPTANCES_PAGE_NAME, + loadComponent: () => import('@features/policy/pages/acceptances/acceptances'), + }, + ], }, ]; diff --git a/src/core/features/reportbuilder/pages/list/list.ts b/src/core/features/reportbuilder/pages/list/list.ts index a506ef78d9b..59692d186a7 100644 --- a/src/core/features/reportbuilder/pages/list/list.ts +++ b/src/core/features/reportbuilder/pages/list/list.ts @@ -35,7 +35,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreReportBuilderListPage implements AfterViewInit, OnDestroy { +export default class CoreReportBuilderListPage implements AfterViewInit, OnDestroy { reports!: CoreListItemsManager; diff --git a/src/core/features/reportbuilder/pages/report/report.ts b/src/core/features/reportbuilder/pages/report/report.ts index 12ec71317da..2f3fa358c52 100644 --- a/src/core/features/reportbuilder/pages/report/report.ts +++ b/src/core/features/reportbuilder/pages/report/report.ts @@ -28,7 +28,7 @@ import { CoreReportBuilderReportDetailComponent } from '../../components/report- CoreReportBuilderReportDetailComponent, ], }) -export class CoreReportBuilderReportPage implements OnInit { +export default class CoreReportBuilderReportPage implements OnInit { reportId!: string; reportDetail?: CoreReportBuilderReportDetail; diff --git a/src/core/features/reportbuilder/reportbuilder-lazy.module.ts b/src/core/features/reportbuilder/reportbuilder-lazy.module.ts deleted file mode 100644 index 0887373e3f8..00000000000 --- a/src/core/features/reportbuilder/reportbuilder-lazy.module.ts +++ /dev/null @@ -1,36 +0,0 @@ -// (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 { CoreReportBuilderListPage } from './pages/list/list'; -import { CoreReportBuilderReportPage } from './pages/report/report'; - -const routes: Routes = [ - { - path: '', - component: CoreReportBuilderListPage, - }, - { - path: ':id', - component: CoreReportBuilderReportPage, - }, -]; - -@NgModule({ - imports: [ - RouterModule.forChild(routes), - ], -}) -export default class CoreReportBuilderLazyModule {} diff --git a/src/core/features/reportbuilder/reportbuilder.module.ts b/src/core/features/reportbuilder/reportbuilder.module.ts index ba5cdca4b28..f5b93830c4a 100644 --- a/src/core/features/reportbuilder/reportbuilder.module.ts +++ b/src/core/features/reportbuilder/reportbuilder.module.ts @@ -23,7 +23,16 @@ import { CoreReportBuilderHandler, CoreReportBuilderHandlerService } from './ser const routes: Routes = [ { path: CoreReportBuilderHandlerService.PAGE_NAME, - loadChildren: () => import('./reportbuilder-lazy.module'), + children: [ + { + path: '', + loadComponent: () => import('@features/reportbuilder/pages/list/list'), + }, + { + path: ':id', + loadComponent: () => import('@features/reportbuilder/pages/report/report'), + }, + ], }, ]; diff --git a/src/core/features/search/pages/global-search/global-search.ts b/src/core/features/search/pages/global-search/global-search.ts index 2c957fc528e..18e0b5c1ac4 100644 --- a/src/core/features/search/pages/global-search/global-search.ts +++ b/src/core/features/search/pages/global-search/global-search.ts @@ -46,7 +46,7 @@ import { CoreSearchGlobalSearchResultComponent } from '../../components/global-s CoreSearchGlobalSearchResultComponent, ], }) -export class CoreSearchGlobalSearchPage implements OnInit, OnDestroy, AfterViewInit { +export default class CoreSearchGlobalSearchPage implements OnInit, OnDestroy, AfterViewInit { courseId: number | null = null; loadMoreError = false; diff --git a/src/core/features/search/search-lazy.module.ts b/src/core/features/search/search-lazy.module.ts index 170828a8885..8c535d02560 100644 --- a/src/core/features/search/search-lazy.module.ts +++ b/src/core/features/search/search-lazy.module.ts @@ -14,7 +14,6 @@ import { NgModule, Injector } from '@angular/core'; import { Routes, ROUTES } from '@angular/router'; -import { CoreSearchGlobalSearchPage } from './pages/global-search/global-search'; import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module'; /** @@ -25,7 +24,7 @@ import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.modu */ function buildRoutes(injector: Injector): Routes { return buildTabMainRoutes(injector, { - component: CoreSearchGlobalSearchPage, + loadComponent: () => import('@features/search/pages/global-search/global-search'), }); } diff --git a/src/core/features/settings/pages/about/about.ts b/src/core/features/settings/pages/about/about.ts index 8153953049e..e7155adbd53 100644 --- a/src/core/features/settings/pages/about/about.ts +++ b/src/core/features/settings/pages/about/about.ts @@ -32,7 +32,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreSettingsAboutPage { +export default class CoreSettingsAboutPage { appName: string; versionName: string; diff --git a/src/core/features/settings/pages/dev/dev.ts b/src/core/features/settings/pages/dev/dev.ts index 7f48b0acb8c..f70ef5ff2cc 100644 --- a/src/core/features/settings/pages/dev/dev.ts +++ b/src/core/features/settings/pages/dev/dev.ts @@ -46,7 +46,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreSettingsDevPage implements OnInit { +export default class CoreSettingsDevPage implements OnInit { rtl = false; forceSafeAreaMargins = false; diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.ts b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts index 5c38df6027a..4e220f6bc70 100644 --- a/src/core/features/settings/pages/deviceinfo/deviceinfo.ts +++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.ts @@ -77,7 +77,7 @@ interface CoreSettingsDeviceInfo { CoreSharedModule, ], }) -export class CoreSettingsDeviceInfoPage implements OnDestroy { +export default class CoreSettingsDeviceInfoPage implements OnDestroy { deviceInfo: CoreSettingsDeviceInfo; deviceOsTranslated?: string; diff --git a/src/core/features/settings/pages/error-log/error-log.ts b/src/core/features/settings/pages/error-log/error-log.ts index 0c9120b44a8..791d4af0826 100644 --- a/src/core/features/settings/pages/error-log/error-log.ts +++ b/src/core/features/settings/pages/error-log/error-log.ts @@ -28,7 +28,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreSettingsErrorLogPage implements OnInit { +export default class CoreSettingsErrorLogPage implements OnInit { errorLogs: CoreSettingsErrorLog[] = []; diff --git a/src/core/features/settings/pages/general/general.ts b/src/core/features/settings/pages/general/general.ts index a27fd5c6439..a378e47108a 100644 --- a/src/core/features/settings/pages/general/general.ts +++ b/src/core/features/settings/pages/general/general.ts @@ -42,7 +42,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreSettingsGeneralPage { +export default class CoreSettingsGeneralPage { languages: { code: string; name: string }[] = []; selectedLanguage = ''; diff --git a/src/core/features/settings/pages/index/index.ts b/src/core/features/settings/pages/index/index.ts index e3ed60bbbaa..8b99af7964d 100644 --- a/src/core/features/settings/pages/index/index.ts +++ b/src/core/features/settings/pages/index/index.ts @@ -28,7 +28,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreSettingsIndexPage implements AfterViewInit, OnDestroy { +export default class CoreSettingsIndexPage implements AfterViewInit, OnDestroy { sections: CoreListItemsManager; diff --git a/src/core/features/settings/pages/licenses/licenses.ts b/src/core/features/settings/pages/licenses/licenses.ts index 868f610079d..3914a2b0880 100644 --- a/src/core/features/settings/pages/licenses/licenses.ts +++ b/src/core/features/settings/pages/licenses/licenses.ts @@ -45,7 +45,7 @@ interface CoreSettingsLicense { CoreSharedModule, ], }) -export class CoreSettingsLicensesPage implements OnInit { +export default class CoreSettingsLicensesPage implements OnInit { licensesUrl: string; loaded = false; diff --git a/src/core/features/settings/pages/site/site.ts b/src/core/features/settings/pages/site/site.ts index f8df27428bf..4189be2e639 100644 --- a/src/core/features/settings/pages/site/site.ts +++ b/src/core/features/settings/pages/site/site.ts @@ -43,7 +43,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreSitePreferencesPage implements AfterViewInit, OnDestroy { +export default class CoreSitePreferencesPage implements AfterViewInit, OnDestroy { @ViewChild(CoreSplitViewComponent) splitView!: CoreSplitViewComponent; diff --git a/src/core/features/settings/pages/space-usage/space-usage.ts b/src/core/features/settings/pages/space-usage/space-usage.ts index 2f50548b2f4..8287d2844f2 100644 --- a/src/core/features/settings/pages/space-usage/space-usage.ts +++ b/src/core/features/settings/pages/space-usage/space-usage.ts @@ -34,7 +34,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreSettingsSpaceUsagePage implements OnInit, OnDestroy { +export default class CoreSettingsSpaceUsagePage implements OnInit, OnDestroy { loaded = false; totalSpaceUsage = 0; diff --git a/src/core/features/settings/pages/synchronization/synchronization.ts b/src/core/features/settings/pages/synchronization/synchronization.ts index 3234b97b49c..d737d5074b8 100644 --- a/src/core/features/settings/pages/synchronization/synchronization.ts +++ b/src/core/features/settings/pages/synchronization/synchronization.ts @@ -39,7 +39,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreSettingsSynchronizationPage implements OnInit, OnDestroy { +export default class CoreSettingsSynchronizationPage implements OnInit, OnDestroy { accountsList: CoreAccountsList = { sameSite: [], diff --git a/src/core/features/settings/settings-lazy.module.ts b/src/core/features/settings/settings-lazy.module.ts index 08bee83e6a4..6c7e0e531ab 100644 --- a/src/core/features/settings/settings-lazy.module.ts +++ b/src/core/features/settings/settings-lazy.module.ts @@ -18,29 +18,20 @@ import { RouterModule, Routes } from '@angular/router'; import { conditionalRoutes } from '@/app/app-routing.module'; import { CoreScreen } from '@services/screen'; -import { CoreSettingsIndexPage } from './pages/index'; import { SHAREDFILES_PAGE_NAME } from '@features/sharedfiles/constants'; -import { CoreSettingsSynchronizationPage } from '@features/settings/pages/synchronization/synchronization'; -import { CoreSettingsGeneralPage } from '@features/settings/pages/general/general'; -import { CoreSettingsSpaceUsagePage } from '@features/settings/pages/space-usage/space-usage'; -import { CoreSettingsAboutPage } from '@features/settings/pages/about/about'; -import { CoreSettingsLicensesPage } from '@features/settings/pages/licenses/licenses'; -import { CoreSettingsDeviceInfoPage } from '@features/settings/pages/deviceinfo/deviceinfo'; -import { CoreSettingsDevPage } from '@features/settings/pages/dev/dev'; -import { CoreSettingsErrorLogPage } from '@features/settings/pages/error-log/error-log'; const sectionRoutes: Routes = [ { path: 'general', - component: CoreSettingsGeneralPage, + loadComponent: () => import('@features/settings/pages/general/general'), }, { path: 'spaceusage', - component: CoreSettingsSpaceUsagePage, + loadComponent: () => import('@features/settings/pages/space-usage/space-usage'), }, { path: 'sync', - component: CoreSettingsSynchronizationPage, + loadComponent: () => import('@features/settings/pages/synchronization/synchronization'), }, { path: SHAREDFILES_PAGE_NAME, @@ -48,14 +39,14 @@ const sectionRoutes: Routes = [ }, { path: 'about', - component: CoreSettingsAboutPage, + loadComponent: () => import('@features/settings/pages/about/about'), }, ]; const mobileRoutes: Routes = [ { path: '', - component: CoreSettingsIndexPage, + loadComponent: () => import('@features/settings/pages/index/index'), }, ...sectionRoutes, ]; @@ -63,7 +54,7 @@ const mobileRoutes: Routes = [ const tabletRoutes: Routes = [ { path: '', - component: CoreSettingsIndexPage, + loadComponent: () => import('@features/settings/pages/index/index'), children: [ { path: '', @@ -80,19 +71,19 @@ const routes: Routes = [ ...conditionalRoutes(tabletRoutes, () => CoreScreen.isTablet), { path: 'about/deviceinfo', - component: CoreSettingsDeviceInfoPage, + loadComponent: () => import('@features/settings/pages/deviceinfo/deviceinfo'), }, { path: 'about/deviceinfo/dev', - component: CoreSettingsDevPage, + loadComponent: () => import('@features/settings/pages/dev/dev'), }, { path: 'about/deviceinfo/dev/error-log', - component: CoreSettingsErrorLogPage, + loadComponent: () => import('@features/settings/pages/error-log/error-log'), }, { path: 'about/licenses', - component: CoreSettingsLicensesPage, + loadComponent: () => import('@features/settings/pages/licenses/licenses'), }, ]; diff --git a/src/core/features/settings/settings-site-lazy.module.ts b/src/core/features/settings/settings-site-lazy.module.ts index b8fd5529e34..d0d63553a77 100644 --- a/src/core/features/settings/settings-site-lazy.module.ts +++ b/src/core/features/settings/settings-site-lazy.module.ts @@ -17,7 +17,6 @@ import { ROUTES, Routes } from '@angular/router'; import { conditionalRoutes } from '@/app/app-routing.module'; import { CoreScreen } from '@services/screen'; -import { CoreSitePreferencesPage } from '@features/settings/pages/site/site'; import { resolveSiteRoutes } from '@features/settings/settings-site-routing.module'; /** @@ -31,14 +30,14 @@ function buildRoutes(injector: Injector): Routes { const mobileRoutes: Routes = [ { path: '', - component: CoreSitePreferencesPage, + loadComponent: () => import('@features/settings/pages/site/site'), }, ...routes.siblings, ]; const tabletRoutes: Routes = [ { path: '', - component: CoreSitePreferencesPage, + loadComponent: () => import('@features/settings/pages/site/site'), children: routes.siblings, }, ]; diff --git a/src/core/features/sharedfiles/pages/choose-site/choose-site.ts b/src/core/features/sharedfiles/pages/choose-site/choose-site.ts index a976ad0741f..c9e06d5c721 100644 --- a/src/core/features/sharedfiles/pages/choose-site/choose-site.ts +++ b/src/core/features/sharedfiles/pages/choose-site/choose-site.ts @@ -34,7 +34,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreSharedFilesChooseSitePage implements OnInit { +export default class CoreSharedFilesChooseSitePage implements OnInit { fileName?: string; loaded = false; diff --git a/src/core/features/sharedfiles/pages/list/list.ts b/src/core/features/sharedfiles/pages/list/list.ts index 56ac5da7e63..7905cf5eee6 100644 --- a/src/core/features/sharedfiles/pages/list/list.ts +++ b/src/core/features/sharedfiles/pages/list/list.ts @@ -32,7 +32,7 @@ import { CoreSharedFilesListComponent } from '../../components/list/list'; CoreSharedFilesListComponent, ], }) -export class CoreSharedFilesListPage implements OnInit { +export default class CoreSharedFilesListPage implements OnInit { siteId?: string; mimetypes?: string[]; diff --git a/src/core/features/sharedfiles/services/sharedfiles-helper.ts b/src/core/features/sharedfiles/services/sharedfiles-helper.ts index 44e0ee0d442..8d332921d65 100644 --- a/src/core/features/sharedfiles/services/sharedfiles-helper.ts +++ b/src/core/features/sharedfiles/services/sharedfiles-helper.ts @@ -26,7 +26,7 @@ import { CoreEvents } from '@singletons/events'; import { CoreLogger } from '@singletons/logger'; import { CoreSharedFiles } from './sharedfiles'; import { SHAREDFILES_PAGE_NAME } from '../constants'; -import { CoreSharedFilesChooseSitePage } from '../pages/choose-site/choose-site'; +import CoreSharedFilesChooseSitePage from '../pages/choose-site/choose-site'; import { CoreError } from '@classes/errors/error'; import { CorePlatform } from '@services/platform'; import { CoreModals } from '@services/overlays/modals'; diff --git a/src/core/features/sharedfiles/sharedfiles-lazy.module.ts b/src/core/features/sharedfiles/sharedfiles-lazy.module.ts index eba353497ac..a2a43d6cf4a 100644 --- a/src/core/features/sharedfiles/sharedfiles-lazy.module.ts +++ b/src/core/features/sharedfiles/sharedfiles-lazy.module.ts @@ -15,17 +15,14 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CoreSharedFilesListPage } from './pages/list/list'; -import { CoreSharedFilesChooseSitePage } from './pages/choose-site/choose-site'; - const routes: Routes = [ { path: 'choosesite', - component: CoreSharedFilesChooseSitePage, + loadComponent: () => import('@features/sharedfiles/pages/choose-site/choose-site'), }, { path: 'list/:hash', - component: CoreSharedFilesListPage, + loadComponent: () => import('@features/sharedfiles/pages/list/list'), }, ]; diff --git a/src/core/features/sitehome/pages/index/index.ts b/src/core/features/sitehome/pages/index/index.ts index 077add74759..f814d1552f9 100644 --- a/src/core/features/sitehome/pages/index/index.ts +++ b/src/core/features/sitehome/pages/index/index.ts @@ -51,7 +51,7 @@ import { CoreBlockSideBlocksButtonComponent } from '../../../block/components/si CoreBlockSideBlocksButtonComponent, ], }) -export class CoreSiteHomeIndexPage implements OnInit, OnDestroy { +export default class CoreSiteHomeIndexPage implements OnInit, OnDestroy { dataLoaded = false; section?: CoreCourseWSSection & { diff --git a/src/core/features/sitehome/sitehome-lazy.module.ts b/src/core/features/sitehome/sitehome-lazy.module.ts deleted file mode 100644 index dd92058642d..00000000000 --- a/src/core/features/sitehome/sitehome-lazy.module.ts +++ /dev/null @@ -1,32 +0,0 @@ -// (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 { CoreSiteHomeIndexPage } from '@features/sitehome/pages/index'; - -const routes: Routes = [ - { - path: '', - component: CoreSiteHomeIndexPage, - }, -]; - -@NgModule({ - imports: [ - RouterModule.forChild(routes), - ], -}) -export default class CoreSiteHomeLazyModule {} diff --git a/src/core/features/sitehome/sitehome.module.ts b/src/core/features/sitehome/sitehome.module.ts index fc597d53374..52a04979cb2 100644 --- a/src/core/features/sitehome/sitehome.module.ts +++ b/src/core/features/sitehome/sitehome.module.ts @@ -37,7 +37,7 @@ export async function getSiteHomeServices(): Promise[]> { const mainMenuHomeRoutes: Routes = [ { path: CoreSiteHomeHomeHandlerService.PAGE_NAME, - loadChildren: () => import('./sitehome-lazy.module'), + loadComponent: () => import('@features/sitehome/pages/index/index'), }, ]; diff --git a/src/core/features/tag/pages/index-area/index-area.ts b/src/core/features/tag/pages/index-area/index-area.ts index 28f749cb1e6..e61896a955e 100644 --- a/src/core/features/tag/pages/index-area/index-area.ts +++ b/src/core/features/tag/pages/index-area/index-area.ts @@ -32,7 +32,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreTagIndexAreaPage implements OnInit { +export default class CoreTagIndexAreaPage implements OnInit { tagId = 0; tagName = ''; diff --git a/src/core/features/tag/pages/index/index.ts b/src/core/features/tag/pages/index/index.ts index 8bb5809beea..a81a6977bb0 100644 --- a/src/core/features/tag/pages/index/index.ts +++ b/src/core/features/tag/pages/index/index.ts @@ -35,7 +35,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreTagIndexPage implements OnInit { +export default class CoreTagIndexPage implements OnInit { tagId = 0; tagName = ''; diff --git a/src/core/features/tag/pages/search/search.ts b/src/core/features/tag/pages/search/search.ts index eddcc929aa2..c88ec1a2896 100644 --- a/src/core/features/tag/pages/search/search.ts +++ b/src/core/features/tag/pages/search/search.ts @@ -42,7 +42,7 @@ import { CoreSearchBoxComponent } from '../../../search/components/search-box/se CoreSearchBoxComponent, ], }) -export class CoreTagSearchPage implements OnInit { +export default class CoreTagSearchPage implements OnInit { collectionId!: number; query!: string; diff --git a/src/core/features/tag/tag-lazy.module.ts b/src/core/features/tag/tag-lazy.module.ts index e05985fdae9..5d4279e0e48 100644 --- a/src/core/features/tag/tag-lazy.module.ts +++ b/src/core/features/tag/tag-lazy.module.ts @@ -17,15 +17,12 @@ import { Injector, NgModule } from '@angular/core'; import { Route, ROUTES, Routes } from '@angular/router'; import { buildTabMainRoutes } from '@features/mainmenu/mainmenu-tab-routing.module'; -import { CoreTagIndexAreaPage } from '@features/tag/pages/index-area/index-area'; -import { CoreTagIndexPage } from '@features/tag/pages/index/index'; -import { CoreTagSearchPage } from '@features/tag/pages/search/search'; import { CoreScreen } from '@services/screen'; import { CoreTagMainMenuHandlerService } from './services/handlers/mainmenu'; const indexAreaRoute: Route = { path: 'index-area', - component: CoreTagIndexAreaPage, + loadComponent: () => import('@features/tag/pages/index-area/index-area'), }; /** @@ -38,7 +35,7 @@ function buildRoutes(injector: Injector): Routes { const mobileRoutes: Routes = [ { path: 'index', - component: CoreTagIndexPage, + loadComponent: () => import('@features/tag/pages/index/index'), }, { ...indexAreaRoute, @@ -49,7 +46,7 @@ function buildRoutes(injector: Injector): Routes { const tabletRoutes: Routes = [ { path: 'index', - component: CoreTagIndexPage, + loadComponent: () => import('@features/tag/pages/index/index'), children: [ indexAreaRoute, ], @@ -62,7 +59,7 @@ function buildRoutes(injector: Injector): Routes { { path: 'search', data: { mainMenuTabRoot: CoreTagMainMenuHandlerService.PAGE_NAME }, - component: CoreTagSearchPage, + loadComponent: () => import('@features/tag/pages/search/search'), }, indexAreaRoute, ...buildTabMainRoutes(injector, { diff --git a/src/core/features/user/pages/about/about.ts b/src/core/features/user/pages/about/about.ts index 4b7a8a9b871..7cb688cfac8 100644 --- a/src/core/features/user/pages/about/about.ts +++ b/src/core/features/user/pages/about/about.ts @@ -50,7 +50,7 @@ import { CoreUserProfileFieldComponent } from '../../components/user-profile-fie CoreUserProfileFieldComponent, ], }) -export class CoreUserAboutPage implements OnInit, OnDestroy { +export default class CoreUserAboutPage implements OnInit, OnDestroy { courseId!: number; userLoaded = false; diff --git a/src/core/features/user/pages/complete-profile/complete-profile.ts b/src/core/features/user/pages/complete-profile/complete-profile.ts index ccb4e8dedb9..74d1df74e42 100644 --- a/src/core/features/user/pages/complete-profile/complete-profile.ts +++ b/src/core/features/user/pages/complete-profile/complete-profile.ts @@ -34,7 +34,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreUserCompleteProfilePage implements OnDestroy { +export default class CoreUserCompleteProfilePage implements OnDestroy { editingProfile = false; logoutLabel: string; diff --git a/src/core/features/user/pages/participants/participants.ts b/src/core/features/user/pages/participants/participants.ts index 93b7705b4b5..583762fbc3d 100644 --- a/src/core/features/user/pages/participants/participants.ts +++ b/src/core/features/user/pages/participants/participants.ts @@ -39,7 +39,7 @@ import { CoreSearchBoxComponent } from '../../../search/components/search-box/se CoreSearchBoxComponent, ], }) -export class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestroy { +export default class CoreUserParticipantsPage implements OnInit, AfterViewInit, OnDestroy { courseId!: number; participants!: CoreUserParticipantsManager; diff --git a/src/core/features/user/pages/profile/profile.ts b/src/core/features/user/pages/profile/profile.ts index cfe62e9e5b1..13d5c402684 100644 --- a/src/core/features/user/pages/profile/profile.ts +++ b/src/core/features/user/pages/profile/profile.ts @@ -48,7 +48,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreUserProfilePage implements OnInit, OnDestroy { +export default class CoreUserProfilePage implements OnInit, OnDestroy { protected courseId?: number; protected userId!: number; diff --git a/src/core/features/user/user-app-lazy.module.ts b/src/core/features/user/user-app-lazy.module.ts deleted file mode 100644 index 4d378f170b7..00000000000 --- a/src/core/features/user/user-app-lazy.module.ts +++ /dev/null @@ -1,31 +0,0 @@ -// (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 { CoreUserCompleteProfilePage } from './pages/complete-profile/complete-profile'; - -const routes: Routes = [ - { - path: 'completeprofile', - component: CoreUserCompleteProfilePage, - }, -]; - -@NgModule({ - imports: [ - RouterModule.forChild(routes), - ], -}) -export default class CoreUserAppLazyModule {} diff --git a/src/core/features/user/user-course-lazy.module.ts b/src/core/features/user/user-course-lazy.module.ts index 6822af08b44..82b7bd1f62d 100644 --- a/src/core/features/user/user-course-lazy.module.ts +++ b/src/core/features/user/user-course-lazy.module.ts @@ -15,18 +15,17 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CoreUserParticipantsPage } from './pages/participants/participants'; import { conditionalRoutes } from '@/app/app-routing.module'; import { CoreScreen } from '@services/screen'; const routes: Routes = [ { path: '', - component: CoreUserParticipantsPage, + loadComponent: () => import('@features/user/pages/participants/participants'), children: conditionalRoutes([ { path: ':userId', - loadChildren: () => import('@features/user/user-profile-lazy.module'), + loadComponent: () => import('@features/user/pages/profile/profile'), data: { swipeManagerSource: 'participants' }, }, ], () => CoreScreen.isTablet), diff --git a/src/core/features/user/user-lazy.module.ts b/src/core/features/user/user-lazy.module.ts index 40d71357c8d..9f598229fe2 100644 --- a/src/core/features/user/user-lazy.module.ts +++ b/src/core/features/user/user-lazy.module.ts @@ -14,7 +14,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { CoreUserAboutPage } from '@features/user/pages/about/about'; const routes: Routes = [ { @@ -24,11 +23,11 @@ const routes: Routes = [ }, { path: 'profile', - loadChildren: () => import('./user-profile-lazy.module'), + loadComponent: () => import('@features/user/pages/profile/profile'), }, { path: 'about', - component: CoreUserAboutPage, + loadComponent: () => import('@features/user/pages/about/about'), }, ]; diff --git a/src/core/features/user/user-profile-lazy.module.ts b/src/core/features/user/user-profile-lazy.module.ts deleted file mode 100644 index 32248d5acc4..00000000000 --- a/src/core/features/user/user-profile-lazy.module.ts +++ /dev/null @@ -1,32 +0,0 @@ -// (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 { CoreUserProfilePage } from '@features/user/pages/profile/profile'; - -const routes: Routes = [ - { - path: '', - component: CoreUserProfilePage, - }, -]; - -@NgModule({ - imports: [ - RouterModule.forChild(routes), - ], -}) -export default class CoreUserProfileLazyModule {} diff --git a/src/core/features/user/user.module.ts b/src/core/features/user/user.module.ts index c2a504fa6e1..5ee7c7fae9c 100644 --- a/src/core/features/user/user.module.ts +++ b/src/core/features/user/user.module.ts @@ -61,8 +61,8 @@ export async function getUsersServices(): Promise[]> { const appRoutes: Routes = [ { - path: 'user', - loadChildren: () => import('@features/user/user-app-lazy.module'), + path: 'user/completeprofile', + loadComponent: () => import('@features/user/pages/complete-profile/complete-profile'), }, ]; @@ -74,7 +74,7 @@ const routes: Routes = [ ...conditionalRoutes([ { path: `${CORE_COURSE_PAGE_NAME}/${CORE_COURSE_INDEX_PATH}/${PARTICIPANTS_PAGE_NAME}/:userId`, - loadChildren: () => import('@features/user/user-profile-lazy.module'), + loadComponent: () => import('@features/user/pages/profile/profile'), data: { swipeManagerSource: 'participants', }, diff --git a/src/core/features/viewer/pages/iframe/iframe.ts b/src/core/features/viewer/pages/iframe/iframe.ts index 3741504fa4c..b7e4ae41fa5 100644 --- a/src/core/features/viewer/pages/iframe/iframe.ts +++ b/src/core/features/viewer/pages/iframe/iframe.ts @@ -28,7 +28,7 @@ import { CoreSharedModule } from '@/core/shared.module'; CoreSharedModule, ], }) -export class CoreViewerIframePage implements OnInit { +export default class CoreViewerIframePage implements OnInit { title?: string; // Page title. url?: string; // Iframe URL. diff --git a/src/core/features/viewer/viewer-lazy.module.ts b/src/core/features/viewer/viewer-lazy.module.ts deleted file mode 100644 index 720fd92f698..00000000000 --- a/src/core/features/viewer/viewer-lazy.module.ts +++ /dev/null @@ -1,31 +0,0 @@ -// (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 { CoreViewerIframePage } from '@features/viewer/pages/iframe/iframe'; - -const routes: Routes = [ - { - path: 'iframe', - component: CoreViewerIframePage, - }, -]; - -@NgModule({ - imports: [ - RouterModule.forChild(routes), - ], -}) -export default class CoreViewerLazyModule {} diff --git a/src/core/features/viewer/viewer.module.ts b/src/core/features/viewer/viewer.module.ts index 64dbf46c778..a88448c6bf6 100644 --- a/src/core/features/viewer/viewer.module.ts +++ b/src/core/features/viewer/viewer.module.ts @@ -20,7 +20,12 @@ import { CoreMainMenuTabRoutingModule } from '@features/mainmenu/mainmenu-tab-ro const routes: Routes = [ { path: 'viewer', - loadChildren: () => import('./viewer-lazy.module'), + children: [ + { + path: 'iframe', + loadComponent: () => import('@features/viewer/pages/iframe/iframe'), + }, + ], }, ];