Merge branch 'main' of https://github.com/CapstoneProjectCMC/frontend

Author: yunomix2834

package-lock.json

@@ -43,7 +43,7 @@
     "date-fns": "^4.1.0",
     "github-markdown-css": "^5.8.1",
     "highlight.js": "^11.11.1",
-    "hls.js": "^1.6.10",
+    "hls.js": "^1.6.13",
     "marked": "^16.2.1",
     "ng-apexcharts": "^1.11.0",
     "ngx-cookie-service": "^20.1.0",

package.json

@@ -21,6 +21,7 @@ import { modalNoticeReducer } from './shared/store/modal-notice-state/modal-noti
 import { MarkdownModule, provideMarkdown } from 'ngx-markdown';
 import { provideLottieOptions } from 'ngx-lottie';
 import { variableReducer } from './shared/store/variable-state/variable.reducer';
+import { CustomPreloadStrategy } from './core/strategies/custom-preload.strategy';
 
 export const appConfig: ApplicationConfig = {
   providers: [
@@ -39,7 +40,7 @@ export const appConfig: ApplicationConfig = {
     }),
     provideAnimations(),
     provideMarkdown(),
-    provideRouter(routes, withPreloading(PreloadAllModules)),
+    provideRouter(routes, withPreloading(CustomPreloadStrategy)),
     importProvidersFrom(MarkdownModule.forRoot()),
   ],
 };

src/app/app.config.ts

@@ -6,6 +6,7 @@ import { AppLayoutComponent } from './layouts/layout-pages/app-layout/app-layout
 import { AdminLayoutComponent } from './layouts/layout-pages/admin-layout/admin-layout';
 // import { RoleGuard } from './core/guards/router-protected/role.guard';
 import { PostModule } from './features/post/post.module';
+import { LandingModule } from './features/landing/landing.module';
 
 export const routes: Routes = [
   //Để test
@@ -76,7 +77,7 @@ export const routes: Routes = [
   {
     path: 'auth',
     component: AuthLayoutComponent,
-    data: { skipBreadcrumb: true },
+    data: { skipBreadcrumb: true, preload: true },
     children: [
       {
         path: 'identity',
@@ -93,10 +94,10 @@ export const routes: Routes = [
     children: [
       {
         path: '',
-        loadChildren: () =>
-          import('./features/landing/landing.module').then(
-            (m) => m.LandingModule
-          ),
+        loadChildren: () => LandingModule,
+        // import('./features/landing/landing.module').then(
+        //   (m) => m.LandingModule
+        // ),
         title: 'CodeCampus',
       },
       {
@@ -115,7 +116,8 @@ export const routes: Routes = [
       },
       {
         path: 'post-features',
-        loadChildren: () => PostModule, //Load đầu tiên k dùng lazyload
+        loadChildren: () =>
+          import('./features/post/post.module').then((m) => m.PostModule), //Load đầu tiên k dùng lazyload
       },
       {
         path: 'resource-learning',
@@ -153,6 +155,7 @@ export const routes: Routes = [
           ),
       },
     ],
+    data: { preload: true },
   },
 
   {
@@ -200,6 +203,7 @@ export const routes: Routes = [
         data: { breadcrumb: 'Quản lý tài nguyên' },
       },
     ],
+    data: { preload: false },
   },
 
   {

src/app/app.routes.ts

@@ -36,6 +36,7 @@ export function getNavHorizontalItems(roles: string[]): SidebarItem[] {
       path: '/codecampus-statistics/admin-exercise-statistics',
       label: 'Thống kê',
       icon: 'fas fa-chart-bar',
+      needHidden: !(roles.length !== 0),
     },
     {
       id: 'management',

src/app/core/router-manager/horizontal-menu.ts

@@ -85,10 +85,10 @@ export class ExerciseService {
     );
   }
 
-  getMyAssignExercise(page: number, size: number) {
+  getMyAssignExercise(page?: number, size?: number) {
     return this.api.get<
       ApiResponse<IPaginationResponse<MyAssignExerciseResponse[]>>
-    >(API_CONFIG.ENDPOINTS.GET.GET_MY_ASSGIN(page, size));
+    >(API_CONFIG.ENDPOINTS.GET.GET_MY_ASSIGN(page, size));
   }
 
   getMyQuizHistory(page: number, size: number) {
@@ -103,7 +103,7 @@ export class ExerciseService {
     >(API_CONFIG.ENDPOINTS.GET.GET_HISTORY_CODE(page, size));
   }
 
-  getMySubmissionsHistory(page: number, size: number) {
+  getMySubmissionsHistory(page?: number, size?: number) {
     return this.api.get<
       ApiResponse<IPaginationResponse<MySubmissionsHistoryResponse[]>>
     >(API_CONFIG.ENDPOINTS.GET.GET_MY_SUBMISSION_HISTORY(page, size));

src/app/core/services/api-service/exercise.service.ts

@@ -102,15 +102,38 @@ export const API_CONFIG = {
 
         return query;
       },
-      GET_MY_ASSGIN: (page: number, size: number) =>
-        `/submission/assignments/self?page=${page}&size=${size}`,
+      GET_MY_ASSIGN: (page?: number, size?: number) => {
+        let url = `/submission/assignments/self`;
+        const params: string[] = [];
+
+        if (page !== undefined) params.push(`page=${page}`);
+        if (size !== undefined) params.push(`size=${size}`);
+
+        if (params.length > 0) {
+          url += `?${params.join('&')}`;
+        }
+
+        return url;
+      },
 
       GET_HISTORY_QUIZ: (page: number, size: number) =>
         `/submission/quiz/self/history?page=${page}&size=${size}`,
       GET_HISTORY_CODE: (page: number, size: number) =>
         `/submission/coding/self/history?page=${page}&size=${size}`,
-      GET_MY_SUBMISSION_HISTORY: (page: number, size: number) =>
-        `/submission/self/history?page=${page}&size=${size}`,
+      GET_MY_SUBMISSION_HISTORY: (page?: number, size?: number) => {
+        let url = `/submission/self/history`;
+        const params: string[] = [];
+
+        if (page !== undefined) params.push(`page=${page}`);
+        if (size !== undefined) params.push(`size=${size}`);
+
+        if (params.length > 0) {
+          url += `?${params.join('&')}`;
+        }
+
+        return url;
+      },
+
       GET_ALL_USER: (
         page: number,
         size: number,

src/app/core/services/config-service/api.enpoints.ts

@@ -0,0 +1,11 @@
+import { PreloadingStrategy, Route } from '@angular/router';
+import { Observable, of } from 'rxjs';
+
+export class CustomPreloadStrategy implements PreloadingStrategy {
+  preload(route: Route, load: () => Observable<any>): Observable<any> {
+    if (route.data && route.data['preload']) {
+      return load();
+    }
+    return of(null);
+  }
+}