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

Author: yunomix2834

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

@@ -40,7 +40,7 @@ export function getNavHorizontalItems(roles: string[]): SidebarItem[] {
     },
     {
       id: 'management',
-      path: 'management/admin',
+      path: 'user-management/user-list',
       label: 'Admin quản lý',
       icon: 'fas fa-user-shield',
       needHidden: !roles.includes(auth_lv2[0]),

src/app/features/auth/pages/error-404/error-404.component.html

@@ -1,7 +1,7 @@
 <div class="error-container">
   <!-- <div class="error-icon">😕</div> -->
   <!-- <h1>404</h1> -->
-  <ng-lottie [options]="lottieOptions" style="width: 500px; height: 500px">
+  <ng-lottie [options]="lottieOptions" style="width: 700px; height: 400px">
   </ng-lottie>
   <h2>Không tìm thấy trang</h2>
   <p>

src/app/features/auth/pages/error-404/error-404.component.scss

@@ -5,6 +5,7 @@
   justify-content: center;
   min-height: 80vh;
   text-align: center;
+  margin-top: 3rem;
   width: 100vw;
 }