Skip to content

Commit

Permalink
MOBILE-4653 chore: Simplify page loading using default classes on core
Browse files Browse the repository at this point in the history
  • Loading branch information
crazyserver committed Feb 3, 2025
1 parent e81ad16 commit e35dfd8
Show file tree
Hide file tree
Showing 91 changed files with 137 additions and 520 deletions.
34 changes: 0 additions & 34 deletions src/core/features/comments/comments-lazy.module.ts

This file was deleted.

4 changes: 2 additions & 2 deletions src/core/features/comments/comments.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ export async function getCommentsServices(): Promise<Type<unknown>[]> {

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'),
},
];

Expand Down
2 changes: 1 addition & 1 deletion src/core/features/comments/pages/viewer/viewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
9 changes: 3 additions & 6 deletions src/core/features/course/course-lazy.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -36,7 +33,7 @@ function buildRoutes(injector: Injector): Routes {
children: [
{
path: '',
component: CoreCourseIndexPage,
loadComponent: () => import('@features/course/pages/index/index'),
data: {
isCourseIndex: true,
},
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/core/features/course/pages/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/core/features/course/services/course-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1981,7 +1981,7 @@ export class CoreCourseHelperProvider {
* @param course Course selected
*/
async openCourseSummary(course: CoreCourseWithImageAndColor & CoreCourseAnyCourseData): Promise<void> {
const { CoreCourseSummaryPage } = await import('../pages/course-summary/course-summary');
const { CoreCourseSummaryPage } = await import('@features/course/pages/course-summary/course-summary');

CoreModals.openSideModal<void>({
component: CoreCourseSummaryPage,
Expand Down
32 changes: 0 additions & 32 deletions src/core/features/courses/courses-dashboard-lazy.module.ts

This file was deleted.

6 changes: 2 additions & 4 deletions src/core/features/courses/courses-lazy.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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',
Expand Down
4 changes: 1 addition & 3 deletions src/core/features/courses/courses-my-lazy.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
},
];

Expand Down
2 changes: 1 addition & 1 deletion src/core/features/courses/courses.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export async function getCoursesExportedObjects(): Promise<Record<string, unknow
const mainMenuHomeChildrenRoutes: Routes = [
{
path: CoreDashboardHomeHandlerService.PAGE_NAME,
loadChildren: () => import('./courses-dashboard-lazy.module'),
loadComponent: () => import('@features/courses/pages/dashboard/dashboard'),
},
];

Expand Down
2 changes: 1 addition & 1 deletion src/core/features/courses/pages/categories/categories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/core/features/courses/pages/dashboard/dashboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<CoreBlockComponent>;

Expand Down
2 changes: 1 addition & 1 deletion src/core/features/courses/pages/list/list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/core/features/courses/pages/my/my.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
33 changes: 0 additions & 33 deletions src/core/features/dataprivacy/dataprivacy-lazy.module.ts

This file was deleted.

3 changes: 2 additions & 1 deletion src/core/features/dataprivacy/dataprivacy.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
},
];

Expand Down
2 changes: 1 addition & 1 deletion src/core/features/dataprivacy/pages/main/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = [];
Expand Down
32 changes: 0 additions & 32 deletions src/core/features/grades/grades-course-lazy.module.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
11 changes: 4 additions & 7 deletions src/core/features/grades/grades-courses-lazy.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
},
],
},
Expand Down
Loading

0 comments on commit e35dfd8

Please sign in to comment.