Merge pull request #22652 from abpframework/auto-merge/rel-9-1/3640

Merge branch rel-9.2 with rel-9.1

.github/workflows/angular.yml

@@ -27,12 +27,12 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: 'npm/ng-packs/node_modules'
           key: ${{ runner.os }}-${{ hashFiles('npm/ng-packs/yarn.lock') }}
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         with:
           path: 'templates/app/angular/node_modules'
           key: ${{ runner.os }}-${{ hashFiles('templates/app/angular/yarn.lock') }}

npm/ng-packs/packages/account/config/src/providers/route.provider.ts

@@ -24,12 +24,14 @@ export function configureRoutes() {
       path: '/account/login',
       name: eAccountRouteNames.Login,
       parentName: eAccountRouteNames.Account,
+      layout: eLayoutType.account,
       order: 1,
     },
     {
       path: '/account/register',
       name: eAccountRouteNames.Register,
       parentName: eAccountRouteNames.Account,
+      layout: eLayoutType.account,
       order: 2,
     },
     {
@@ -45,12 +47,14 @@ export function configureRoutes() {
       path: '/account/forgot-password',
       parentName: eAccountRouteNames.Account,
       name: eAccountRouteNames.ForgotPassword,
+      layout: eLayoutType.account,
       invisible: true,
     },
     {
       path: '/account/reset-password',
       parentName: eAccountRouteNames.Account,
       name: eAccountRouteNames.ResetPassword,
+      layout: eLayoutType.account,
       invisible: true,
     },
   ]);