Merge pull request #4308 from crazyserver/MOBILE-4759

Mobile 4759

Author: dpalou

.eslintrc.js

@@ -199,7 +199,7 @@ const appConfig = {
         'id-match': 'error',
         'jsdoc/check-alignment': 'error',
         'jsdoc/check-param-names': [
-            'warn',
+            'error',
             {
                 checkDestructured: false,
                 enableFixer: true

.github/workflows/testing.yml

@@ -69,7 +69,7 @@ jobs:
         cat circular-dependencies
         lines=$(cat circular-dependencies | wc -l)
         echo "Total circular dependencies: $lines"
-        test $lines -eq 93
+        test $lines -eq 95
     - name: JavaScript code compatibility
       run: |
         npx check-es-compat www/*.js --polyfills="\{Array,String,TypedArray\}.prototype.at,Object.hasOwn"

src/addons/badges/badge-lazy.module.ts

@@ -26,6 +26,8 @@ import { CorePushNotificationsDelegate } from '@features/pushnotifications/servi
 import { AddonBadgesPushClickHandler } from './services/handlers/push-click';
 import { CoreTagAreaDelegate } from '@features/tag/services/tag-area-delegate';
 import { AddonBadgesTagAreaHandler } from './services/handlers/tag-area';
+import { conditionalRoutes } from '@/app/app-routing.module';
+import { CoreScreen } from '@services/screen';
 
 /**
  * Get badges services.
@@ -40,18 +42,51 @@ export async function getBadgesServices(): Promise<Type<unknown>[]> {
     ];
 }
 
+const mobileRoutes: Routes = [
+    {
+        path: '',
+        pathMatch: 'full',
+        loadComponent: () => import('./pages/user-badges/user-badges'),
+    },
+    {
+        path: ':badgeHash',
+        loadComponent: () => import('./pages/issued-badge/issued-badge'),
+        data: { usesSwipeNavigation: true },
+    },
+];
+
+const tabletRoutes: Routes = [
+    {
+        path: '',
+        loadComponent: () => import('./pages/user-badges/user-badges'),
+        children: [
+            {
+                path: ':badgeHash',
+                loadComponent: () => import('./pages/issued-badge/issued-badge'),
+                data: { usesSwipeNavigation: true },
+            },
+        ],
+    },
+];
+
+const routes: Routes = [
+    ...conditionalRoutes(mobileRoutes, () => CoreScreen.isMobile),
+    ...conditionalRoutes(tabletRoutes, () => CoreScreen.isTablet),
+];
+
 const mainMenuRoutes: Routes = [
     {
-        path: 'badge',
-        loadChildren: () => import('./badge-lazy.module'),
+        path: 'badge/:badgeHash',
+        loadComponent: () => import('./pages/issued-badge/issued-badge'),
+        data: { usesSwipeNavigation: false },
     },
     {
         path: 'badges',
-        loadChildren: () => import('./badges-lazy.module'),
+        children: routes,
     },
     {
-        path: 'badgeclass',
-        loadChildren: () => import('./badgeclass-lazy.module'),
+        path: 'badgeclass/:badgeId',
+        loadComponent: () => import('./pages/badge-class/badge-class'),
     },
 ];
 

src/addons/badges/badgeclass-lazy.module.ts

@@ -20,15 +20,20 @@ import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreTime } from '@singletons/time';
 import { AddonBadges, AddonBadgesBadgeClass } from '../../services/badges';
 import { CoreAlerts } from '@services/overlays/alerts';
+import { CoreSharedModule } from '@/core/shared.module';
 
 /**
  * Page that displays a badge class.
  */
 @Component({
     selector: 'page-addon-badges-badge-class',
     templateUrl: 'badge-class.html',
+    standalone: true,
+    imports: [
+        CoreSharedModule,
+    ],
 })
-export class AddonBadgesBadgeClassPage implements OnInit {
+export default class AddonBadgesBadgeClassPage implements OnInit {
 
     protected badgeId = 0;
     protected logView: (badge: AddonBadgesBadgeClass) => void;

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

@@ -40,7 +40,7 @@ import { CoreAlerts } from '@services/overlays/alerts';
         CoreSharedModule,
     ],
 })
-export class AddonBadgesIssuedBadgePage implements OnInit, OnDestroy {
+export default class AddonBadgesIssuedBadgePage implements OnInit, OnDestroy {
 
     protected badgeHash = '';
     protected userId!: number;

src/addons/badges/badges.module.ts

@@ -26,15 +26,20 @@ import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
 import { CoreTime } from '@singletons/time';
 import { Translate } from '@singletons';
 import { CoreAlerts } from '@services/overlays/alerts';
+import { CoreSharedModule } from '@/core/shared.module';
 
 /**
  * Page that displays the list of calendar events.
  */
 @Component({
     selector: 'page-addon-badges-user-badges',
     templateUrl: 'user-badges.html',
+    standalone: true,
+    imports: [
+        CoreSharedModule,
+    ],
 })
-export class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
+export default class AddonBadgesUserBadgesPage implements AfterViewInit, OnDestroy {
 
     currentTime = 0;
     badges: CoreListItemsManager<AddonBadgesUserBadge, AddonBadgesUserBadgesSource>;

src/addons/badges/pages/badge-class/badge-class.ts

@@ -35,7 +35,7 @@ import { PageLoadWatcher } from '@classes/page-load-watcher';
 import { PageLoadsManager } from '@classes/page-loads-manager';
 import { DownloadStatus } from '@/core/constants';
 import { CoreSharedModule } from '@/core/shared.module';
-import { CoreCoursesComponentsModule } from '@features/courses/components/components.module';
+import { CoreCoursesCourseListItemComponent } from '@features/courses/components/course-list-item/course-list-item';
 import {
     CORE_COURSES_MY_COURSES_UPDATED_EVENT,
     CoreCoursesMyCoursesUpdatedEventAction,
@@ -58,7 +58,7 @@ const FILTER_PRIORITY: AddonBlockMyOverviewTimeFilters[] =
     standalone: true,
     imports: [
         CoreSharedModule,
-        CoreCoursesComponentsModule,
+        CoreCoursesCourseListItemComponent,
     ],
 })
 export class AddonBlockMyOverviewComponent extends CoreBlockBaseComponent implements OnInit, OnDestroy, OnChanges {