Skip to content

Commit f092248

Browse files
committed
MOBILE-4759 chore: Simplify page loading using default classes on core
1 parent 46392a2 commit f092248

File tree

92 files changed

+138
-521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+138
-521
lines changed

src/addons/blog/blog-lazy.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { canLeaveGuard } from '@guards/can-leave';
2929
return [
3030
{
3131
path: 'index',
32-
loadChildren: () => import('./pages/index/index'),
32+
loadComponent: () => import('./pages/index/index'),
3333
data: {
3434
mainMenuTabRoot: ADDON_BLOG_MAINMENU_PAGE_NAME,
3535
},

src/core/features/comments/comments-lazy.module.ts

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/core/features/comments/comments.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ export async function getCommentsServices(): Promise<Type<unknown>[]> {
4040

4141
const routes: Routes = [
4242
{
43-
path: 'comments',
44-
loadChildren: () => import('@features/comments/comments-lazy.module'),
43+
path: 'comments/:contextLevel/:instanceId/:componentName/:itemId',
44+
loadComponent: () => import('@features/comments/pages/viewer/viewer'),
4545
},
4646
];
4747

src/core/features/comments/pages/viewer/viewer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import { CoreSharedModule } from '@/core/shared.module';
6161
CoreSharedModule,
6262
],
6363
})
64-
export class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterViewInit {
64+
export default class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterViewInit {
6565

6666
@ViewChild(IonContent) content?: IonContent;
6767

src/core/features/course/course-lazy.module.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
import { Injector, NgModule } from '@angular/core';
1616
import { ROUTES, Routes } from '@angular/router';
1717
import { resolveIndexRoutes } from '@features/course/course-routing.module';
18-
import { CoreCourseIndexPage } from '@features/course/pages/index';
19-
import { CoreCourseListModTypePage } from '@features/course/pages/list-mod-type/list-mod-type';
20-
import { CoreCourseModulePreviewPage } from '@features/course/pages/module-preview/module-preview';
2118
import { CoreCourseHelper } from './services/course-helper';
2219
import { CORE_COURSE_INDEX_PATH } from './constants';
2320

@@ -36,7 +33,7 @@ function buildRoutes(injector: Injector): Routes {
3633
children: [
3734
{
3835
path: '',
39-
component: CoreCourseIndexPage,
36+
loadComponent: () => import('@features/course/pages/index/index'),
4037
data: {
4138
isCourseIndex: true,
4239
},
@@ -47,11 +44,11 @@ function buildRoutes(injector: Injector): Routes {
4744
},
4845
{
4946
path: ':courseId/:cmId/module-preview',
50-
component: CoreCourseModulePreviewPage,
47+
loadComponent: () => import('@features/course/pages/module-preview/module-preview'),
5148
},
5249
{
5350
path: ':courseId/list-mod-type',
54-
component: CoreCourseListModTypePage,
51+
loadComponent: () => import('@features/course/pages/list-mod-type/list-mod-type'),
5552
},
5653
{
5754
path: ':courseId/summary',

src/core/features/course/pages/index/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import { CoreSharedModule } from '@/core/shared.module';
4545
CoreSharedModule,
4646
],
4747
})
48-
export class CoreCourseIndexPage implements OnInit, OnDestroy {
48+
export default class CoreCourseIndexPage implements OnInit, OnDestroy {
4949

5050
@ViewChild(CoreTabsOutletComponent) tabsComponent?: CoreTabsOutletComponent;
5151
@ViewChild('courseThumb') courseThumb?: ElementRef;

src/core/features/course/pages/list-mod-type/list-mod-type.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import { CoreSharedModule } from '@/core/shared.module';
4242
CoreCourseModuleComponent,
4343
],
4444
})
45-
export class CoreCourseListModTypePage implements OnInit {
45+
export default class CoreCourseListModTypePage implements OnInit {
4646

4747
private static readonly PAGE_LENGTH = 10; // How many activities should load each time showMoreActivities is called.
4848

src/core/features/course/pages/module-preview/module-preview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import { CoreSharedModule } from '@/core/shared.module';
4242
CoreCourseModuleNavigationComponent,
4343
],
4444
})
45-
export class CoreCourseModulePreviewPage implements OnInit {
45+
export default class CoreCourseModulePreviewPage implements OnInit {
4646

4747
title!: string;
4848
module!: CoreCourseModuleData;

src/core/features/course/services/course-helper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1981,7 +1981,7 @@ export class CoreCourseHelperProvider {
19811981
* @param course Course selected
19821982
*/
19831983
async openCourseSummary(course: CoreCourseWithImageAndColor & CoreCourseAnyCourseData): Promise<void> {
1984-
const { CoreCourseSummaryPage } = await import('../pages/course-summary/course-summary');
1984+
const { CoreCourseSummaryPage } = await import('@features/course/pages/course-summary/course-summary');
19851985

19861986
CoreModals.openSideModal<void>({
19871987
component: CoreCourseSummaryPage,

src/core/features/courses/courses-dashboard-lazy.module.ts

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)