From 4fc58cdf9d8bd2d8419b577c2bb4c5676e94f623 Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Fri, 10 Dec 2021 15:40:15 +0300
Subject: [PATCH 1/3] feat: downgrade project to abp v4.4

---
 apps/angular/angular.json                     |   2 +-
 apps/angular/package.json                     |  18 +-
 .../src/pages/product/product.component.html  |   4 +-
 apps/angular/src/app/app.module.ts            |   2 +
 apps/angular/yarn.lock                        | 339 +++++++++++-------
 package.json                                  |   5 +
 yarn.lock                                     |  15 +
 7 files changed, 240 insertions(+), 145 deletions(-)
 create mode 100644 package.json
 create mode 100644 yarn.lock

diff --git a/apps/angular/angular.json b/apps/angular/angular.json
index 31fc0890..6884a1fd 100644
--- a/apps/angular/angular.json
+++ b/apps/angular/angular.json
@@ -51,7 +51,7 @@
                 "bundleName": "ngx-datatable-material"
               },
               {
-                "input": "node_modules/bootstrap/dist/css/bootstrap.rtl.min.css",
+                "input": "node_modules/@abp/ng.theme.shared/styles/bootstrap-rtl.min.css",
                 "inject": false,
                 "bundleName": "bootstrap-rtl.min"
               },
diff --git a/apps/angular/package.json b/apps/angular/package.json
index b33a31c1..198e3df3 100644
--- a/apps/angular/package.json
+++ b/apps/angular/package.json
@@ -12,14 +12,14 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~5.0.0-rc.2",
-    "@abp/ng.components": "~5.0.0-rc.2",
-    "@abp/ng.core": "~5.0.0-rc.2",
-    "@abp/ng.identity": "~5.0.0-rc.2",
-    "@abp/ng.setting-management": "~5.0.0-rc.2",
-    "@abp/ng.tenant-management": "~5.0.0-rc.2",
-    "@abp/ng.theme.basic": "~5.0.0-rc.2",
-    "@abp/ng.theme.shared": "~5.0.0-rc.2",
+    "@abp/ng.account": "4.4.4",
+    "@abp/ng.components": "4.4.4",
+    "@abp/ng.core": "4.4.4",
+    "@abp/ng.identity": "4.4.4",
+    "@abp/ng.setting-management": "4.4.4",
+    "@abp/ng.tenant-management": "4.4.4",
+    "@abp/ng.theme.basic": "4.4.4",
+    "@abp/ng.theme.shared": "4.4.4",
     "@angular/animations": "~12.2.8",
     "@angular/common": "~12.2.8",
     "@angular/compiler": "~12.2.8",
@@ -34,7 +34,7 @@
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@abp/ng.schematics": "~5.0.0-rc.2",
+    "@abp/ng.schematics": "4.4.4",
     "@angular-devkit/build-angular": "~12.2.8",
     "@angular/cli": "~12.2.8",
     "@angular/compiler-cli": "~12.2.8",
diff --git a/apps/angular/projects/catalog/src/pages/product/product.component.html b/apps/angular/projects/catalog/src/pages/product/product.component.html
index 898b4918..45a2c244 100644
--- a/apps/angular/projects/catalog/src/pages/product/product.component.html
+++ b/apps/angular/projects/catalog/src/pages/product/product.component.html
@@ -4,7 +4,7 @@
       <div class="col col-md-6">
         <h5 class="card-title">{{ 'CatalogService::Products' | abpLocalization }}</h5>
       </div>
-      <div class="text-end col col-md-6">
+      <div class="text-right col col-md-6">
         <button class="btn btn-primary" (click)="onCreate()" *abpPermission="permissions.create">
           {{ 'CatalogService::NewProduct' | abpLocalization }}
         </button>
@@ -26,7 +26,7 @@
               aria-haspopup="true"
               ngbDropdownToggle
             >
-              <i class="me-1 fa fa-cog"></i>{{ 'AbpUi::Actions' | abpLocalization }}
+              <i class="mr-1 fa fa-cog"></i>{{ 'AbpUi::Actions' | abpLocalization }}
             </button>
             <div ngbDropdownMenu>
               <button
diff --git a/apps/angular/src/app/app.module.ts b/apps/angular/src/app/app.module.ts
index 697f05af..0b8c697a 100644
--- a/apps/angular/src/app/app.module.ts
+++ b/apps/angular/src/app/app.module.ts
@@ -10,6 +10,7 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { CatalogConfigModule } from '@eshoponabp/catalog/config';
+import { NgxsModule } from '@ngxs/store';
 import { environment } from '../environments/environment';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
@@ -31,6 +32,7 @@ import { APP_ROUTE_PROVIDER } from './route.provider';
     SettingManagementConfigModule.forRoot(),
     ThemeBasicModule.forRoot(),
     CatalogConfigModule.forRoot(),
+    NgxsModule.forRoot(),
   ],
   declarations: [AppComponent],
   providers: [APP_ROUTE_PROVIDER],
diff --git a/apps/angular/yarn.lock b/apps/angular/yarn.lock
index 74b6dea5..e19dc085 100644
--- a/apps/angular/yarn.lock
+++ b/apps/angular/yarn.lock
@@ -2,72 +2,73 @@
 # yarn lockfile v1
 
 
-"@abp/ng.account.core@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/ng.account.core/-/ng.account.core-5.0.0-rc.2.tgz#f8d3686fa1ebba3d750de96b018cbea78e5f6f3d"
-  integrity sha512-lsoI0isa/F1WKsuPo/UgnE3WdwxaE5qVIGf8vEv5e8vUR0c7SZSBn+bG9qcNfkGk5G6tYkjSBDq75zHthVL1Eg==
+"@abp/ng.account.core@~4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/ng.account.core/-/ng.account.core-4.4.4.tgz#e1b8da198fae9fa90032e1111560abf213afed76"
+  integrity sha512-VmP7cGnigr1Qr1JHCE/YQvVAx9q84M8eikRXto/H8raIyVGMaQ1ThywMakd08TyS+pPzVv+5PFRKEpRx9a6aaw==
   dependencies:
     tslib "^2.0.0"
 
-"@abp/ng.account@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-5.0.0-rc.2.tgz#53965ccc21953e6696770a601f5e4ef731536ce3"
-  integrity sha512-xlMzjI587qhfcXRn4yQss/f2EP8fRdPdXd7eAhX4ZlNl7otUUMMNGQ1AK8J0ULUbW9dEyzT06ZXEQlWpy42vBw==
+"@abp/ng.account@4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-4.4.4.tgz#22dc962a388d2d7bb4fb96f03a6a24bef95b578f"
+  integrity sha512-8VnH+2G8rG1R9DXHgMwluYweMkd5d0VLha/UWlehX1cqhcbDJ2bjl+SwqhpaYSc8XcCkgOZOjg48FH1QAXM9Fw==
   dependencies:
-    "@abp/ng.account.core" "~5.0.0-rc.2"
-    "@abp/ng.theme.shared" "~5.0.0-rc.2"
+    "@abp/ng.theme.shared" "~4.4.4"
     tslib "^2.0.0"
 
-"@abp/ng.components@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/ng.components/-/ng.components-5.0.0-rc.2.tgz#62f69382899f114d34754ab344ae39fba4a7882c"
-  integrity sha512-ROAJ2yIW6ziEHQbV2ASgBJAO2YbhwzOHLnD6tzIsesBM6IkN82jB4SpHuJJLiCmjWSukEZ0jzPBpD0S4ASfLPQ==
+"@abp/ng.components@4.4.4", "@abp/ng.components@~4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/ng.components/-/ng.components-4.4.4.tgz#5952fb2acb45b886e2bc48928ec3ea2d2b4a2555"
+  integrity sha512-7tbL9dhTQOKHYKoOqa2Gu4I5i/169l1Ie9QLWvyZ1wa3n2e0sssAKRJhqGfqo3uY4z8rYvN2UnzcMwCfPKfY4w==
   dependencies:
-    chart.js "^3.5.1"
-    ng-zorro-antd "^12.0.1"
+    ng-zorro-antd "^11.0.0"
     tslib "^2.0.0"
 
-"@abp/ng.core@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-5.0.0-rc.2.tgz#cbbb6652c6d638e403adcbea76c4e6aff098285f"
-  integrity sha512-63o2FggmefNij0K3e7gKvwDjaW2Qgq7o+VF1WFWu7utNiLkhEhdS+bVABw4SsNm2yuNf2izzQYKnm3PXc7vR5w==
+"@abp/ng.core@4.4.4", "@abp/ng.core@~4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-4.4.4.tgz#e918d9fd68c88667569ef94c50eefa1271516f6d"
+  integrity sha512-w5TUdKJ13vm3YN4sebdO8Vwx9/LI3t78axmqdV+9AYPpg1cFTkNtzjMbsMO3+7qszwOdTwcpc3PVDu8V0EOjDA==
   dependencies:
-    "@abp/utils" "~5.0.0-rc.2"
-    angular-oauth2-oidc "^12.1.0"
-    just-clone "^3.2.1"
-    just-compare "^1.4.0"
+    "@abp/utils" "~4.4.4"
+    "@angular/localize" "~10.0.10"
+    "@ngxs/store" "^3.7.0"
+    angular-oauth2-oidc "^10.0.0"
+    just-clone "^3.1.0"
+    just-compare "^1.3.0"
+    snq "^1.0.3"
     ts-toolbelt "6.15.4"
     tslib "^2.0.0"
 
-"@abp/ng.feature-management@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-5.0.0-rc.2.tgz#e3796dcb82eaa6144fea09a4e25fe43f708022bd"
-  integrity sha512-W2SszPVz1ZFmyS/FwAi1v2zst0aheQWS0oYsjKq/Jo6aRhRKq+gXSg3XMbSqb7iyks6DlmLGpq8rwlasURbUfw==
+"@abp/ng.feature-management@~4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-4.4.4.tgz#de64fa161cbe07b71fb34257bcb7ef16f10f030d"
+  integrity sha512-sDtDwVbfRXRTGf8W0TyF4NZUmbbMT8aOQcCwYfing6Y1oUcKV3LhMbYJqtCcJCQBG1a1Ii1kbvE7JOF4t6Wb/g==
   dependencies:
-    "@abp/ng.theme.shared" "~5.0.0-rc.2"
+    "@abp/ng.theme.shared" "~4.4.4"
     tslib "^2.0.0"
 
-"@abp/ng.identity@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-5.0.0-rc.2.tgz#97c7d145bf5f72745bc11139e15b7ec50a131216"
-  integrity sha512-QVIN1zPhjPBH7re+wUPkmQJwPZrXqpnAZlNSPWzA0HH9RwG+MBglZGQf0xiYinFnI3VUpi9JV8EOWYVwjITLrA==
+"@abp/ng.identity@4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-4.4.4.tgz#2b7b3439082b772a9f4de800dcf0ff3a8ee1b65c"
+  integrity sha512-B0re6RxKlikt+qGkBmgUyEHt9M4iMG8NglP42xeOnnbStnlJnx1ZI81+7mrcnxvJU3iNwDrWGV1CUGVQY7Zvmg==
   dependencies:
-    "@abp/ng.permission-management" "~5.0.0-rc.2"
-    "@abp/ng.theme.shared" "~5.0.0-rc.2"
+    "@abp/ng.permission-management" "~4.4.4"
+    "@abp/ng.theme.shared" "~4.4.4"
     tslib "^2.0.0"
 
-"@abp/ng.permission-management@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-5.0.0-rc.2.tgz#b80a636c2e1cbf60fd05e25e831ea74e4e940b2d"
-  integrity sha512-lzRlUdzSyBjWGuXShbwpzQgPxyk9E/K+DrmyhPd5JTIjPd/0xjjxdqzifLcQEhS46AMe1vjWueYFLXqGK8UO3w==
+"@abp/ng.permission-management@~4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-4.4.4.tgz#8bb010de0aa4fb46c6807eda8b9db49dccf7018e"
+  integrity sha512-LcnYtXyDdGKXeJTUcsG/ZtwLzs6D8Au+M7Z3pO9ih/WxMmJBd+yCO0ekHIXe6XZW8DzSGWfRQfRrY1mmkcAhag==
   dependencies:
-    "@abp/ng.theme.shared" "~5.0.0-rc.2"
+    "@abp/ng.theme.shared" "~4.4.4"
     tslib "^2.0.0"
 
-"@abp/ng.schematics@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-5.0.0-rc.2.tgz#261cdcfd3fbc3104dedace819949ba07e166f7ae"
-  integrity sha512-RpnYiovgbxpEbGxYnreWaZrOT6OJu9Ij4fpDxWpJGH267n41AemaEsk8a8F3fpjQxIjYjlivbvPfXJAs2igu0A==
+"@abp/ng.schematics@4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-4.4.4.tgz#c4d14c0d6a41634e23a5e940f6420c001a7bfbb0"
+  integrity sha512-QihrOd2+mQ9aenVjxQBjim/+lXxkQJtogaBuzdkdz/2GEcW2shbqmBF4eCp5E7+F4SBgrLcj40ZmtNwMjJppbA==
   dependencies:
     "@angular-devkit/core" "~11.0.2"
     "@angular-devkit/schematics" "~11.0.2"
@@ -76,50 +77,51 @@
     should-quote "^1.0.0"
     typescript "~3.9.2"
 
-"@abp/ng.setting-management@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-5.0.0-rc.2.tgz#db2a05a502ed601f6204a7af6f259592c09f5b1a"
-  integrity sha512-IUMa1WOvzaUGxFqn5ZqZx2L5ktGYD9zRdvfPb8oixHqTn7s8QNQNbfspEzuPerazHUCDpAgd8VYHvRnDwogVrg==
+"@abp/ng.setting-management@4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-4.4.4.tgz#42c542a354627ee4dc5bc8b8ad1f9bbea632c984"
+  integrity sha512-cGUzNJh4eC1VgRCIaXYQ1UpqnPr9l38miCURH9ASLYNOVSUU/JxhUdOTTR/tQ8QXPLi2C7b7zoFzSh9TFjEVSQ==
   dependencies:
-    "@abp/ng.components" "~5.0.0-rc.2"
-    "@abp/ng.theme.shared" "~5.0.0-rc.2"
+    "@abp/ng.components" "~4.4.4"
+    "@abp/ng.theme.shared" "~4.4.4"
     tslib "^2.0.0"
 
-"@abp/ng.tenant-management@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-5.0.0-rc.2.tgz#66f3e61d1cc83e346f766ce66f12fbbb161ea8f3"
-  integrity sha512-KVHx0Hoo1iqIBslTS594e475+r5Vpt6biHyivUm3/ShjsC1DETu0IRrpT/HVBpNGZnsXSd4lIE6wHZPKKSyu7g==
+"@abp/ng.tenant-management@4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-4.4.4.tgz#8d50be64a35fa0e2c9fe6b94b5eb275bada5e2c4"
+  integrity sha512-ZyNmQ98IMw4YMrE33bbC7AJaH/UEKJ6AXVMsCN2kaMQv+FbOsqHjkFSGlZJgiYOmoxZbdnpyO6xuxjLcpiCzqA==
   dependencies:
-    "@abp/ng.feature-management" "~5.0.0-rc.2"
-    "@abp/ng.theme.shared" "~5.0.0-rc.2"
+    "@abp/ng.feature-management" "~4.4.4"
+    "@abp/ng.theme.shared" "~4.4.4"
     tslib "^2.0.0"
 
-"@abp/ng.theme.basic@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-5.0.0-rc.2.tgz#abb8d770a8cea902158577a85ffd5650a41b87b1"
-  integrity sha512-5yp+tDrgYezq0Ot3SaSEBGPqytNFkAgszym8xnChh2doopxj+8LmL/NfGCq7SqLQtAioe4Le8dYQwq1dVGmihQ==
+"@abp/ng.theme.basic@4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-4.4.4.tgz#9c2678e6f005c09f33d24e17483175bb5bfd1f85"
+  integrity sha512-UPIHGSpnfY+RQH5vDMU5oKhJchLZJj8/6DDSCddteiC1r0dcs/8aY+30ccu8HDUT8bcO8hz5jNeOa9aqHz2SfA==
   dependencies:
-    "@abp/ng.account.core" "~5.0.0-rc.2"
-    "@abp/ng.theme.shared" "~5.0.0-rc.2"
+    "@abp/ng.account.core" "~4.4.4"
+    "@abp/ng.theme.shared" "~4.4.4"
     tslib "^2.0.0"
 
-"@abp/ng.theme.shared@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-5.0.0-rc.2.tgz#94b550d23fe7cd96869de7e338083469f691ca6f"
-  integrity sha512-pXrZrH+LhuR4Gc6wHIr7Ghn8R9OPggxFDApezYcBZKuqUaYQ0ZsLC6ZR536N710RtTPT0fIB8XxUWluTtce0WA==
-  dependencies:
-    "@abp/ng.core" "~5.0.0-rc.2"
-    "@fortawesome/fontawesome-free" "^5.15.4"
-    "@ng-bootstrap/ng-bootstrap" "11.0.0-beta.2"
-    "@ngx-validate/core" "^0.1.1"
-    "@swimlane/ngx-datatable" "^19.0.0"
-    bootstrap "^5.1.1"
+"@abp/ng.theme.shared@4.4.4", "@abp/ng.theme.shared@~4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-4.4.4.tgz#45abe515727d8ef4a1764bb012bd7f2ffd16ce9b"
+  integrity sha512-NkDK+ZfT1D//M7PeehWnSzoYGQ84Cyb1gfySKfxMxrDRLcsiiJSBG8IHgCenuvP7LDs9qqXVRzD1pe8ESb9UCg==
+  dependencies:
+    "@abp/ng.core" "~4.4.4"
+    "@fortawesome/fontawesome-free" "^5.14.0"
+    "@ng-bootstrap/ng-bootstrap" "^7.0.0"
+    "@ngx-validate/core" "^0.0.13"
+    "@swimlane/ngx-datatable" "^17.1.0"
+    bootstrap "~4.6.0"
+    chart.js "^2.9.3"
     tslib "^2.0.0"
 
-"@abp/utils@~5.0.0-rc.2":
-  version "5.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.0.0-rc.2.tgz#4ffc8e937c2e83f91c60a2f1222d8e046ab7dd54"
-  integrity sha512-/6QL6EdCatyz4igdPA0K0Cs/0fe3AatGyYYtwb+SBnZBcySqF+BUBWVlwMDJks8V/oUrJMQNy41foNuLGJb3jQ==
+"@abp/utils@~4.4.4":
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.4.4.tgz#0bd79fa4635224fcae7ff61224a8c54266db73bf"
+  integrity sha512-h8Nt2OPqi8EiXKAuvJIpBlCHhavL7BHr+ntJXY6yM4aCdcQtJdSAgNmh0skzEGnf1hZxrYOugtAz4Pk1WNjv/g==
   dependencies:
     just-compare "^1.3.0"
 
@@ -281,12 +283,12 @@
   dependencies:
     tslib "^2.2.0"
 
-"@angular/cdk@^12.1.0":
-  version "12.2.13"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-12.2.13.tgz#1fdbe814adfd6b4ff906c6d9c4c6df07b83f09d8"
-  integrity sha512-zSKRhECyFqhingIeyRInIyTvYErt4gWo+x5DQr0b7YLUbU8DZSwWnG4w76Ke2s4U8T7ry1jpJBHoX/e8YBpGMg==
+"@angular/cdk@^11.0.2":
+  version "11.2.13"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.2.13.tgz#d54c9187e3b8cf3f8ba190b1edddc08ed2b740de"
+  integrity sha512-FkE4iCwoLbQxLDUOjV1I7M/6hmpyb7erAjEdWgch7nGRNxF1hqX5Bqf1lvLFKPNCbx5NRI5K7YVAdIUQUR8vug==
   dependencies:
-    tslib "^2.2.0"
+    tslib "^2.0.0"
   optionalDependencies:
     parse5 "^5.0.0"
 
@@ -387,6 +389,15 @@
     glob "7.1.7"
     yargs "^17.0.0"
 
+"@angular/localize@~10.0.10":
+  version "10.0.14"
+  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-10.0.14.tgz#99064a3b12e94e54e791c0638fbbbcc8783d8a62"
+  integrity sha512-tV1oUii6bxpQ6bKELcZsibUEEGmNiROxy8xRW015VgrgMFhuNuesHSmNUIstZ7ag8/sjh0/w1p55PUB6LEiPFA==
+  dependencies:
+    "@babel/core" "7.8.3"
+    glob "7.1.2"
+    yargs "15.3.0"
+
 "@angular/platform-browser-dynamic@~12.2.8":
   version "12.2.14"
   resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.2.14.tgz#202fd89ba7f758ca998ee5b6498d4a834472f664"
@@ -415,10 +426,10 @@
   dependencies:
     "@ctrl/tinycolor" "^3.3.1"
 
-"@ant-design/icons-angular@^12.0.3":
-  version "12.0.3"
-  resolved "https://registry.yarnpkg.com/@ant-design/icons-angular/-/icons-angular-12.0.3.tgz#3e99aa99ceebb978384a2926d06da19c043fc4bd"
-  integrity sha512-Jl/O7fQiFGsFHuesOp7Oo/TKTPSlWAqMa2DBQdgQbNzv2c3v1ijQWd54ymDC6ftIHMsKD30nJ6bekCiqdbfZuA==
+"@ant-design/icons-angular@^11.0.1":
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/@ant-design/icons-angular/-/icons-angular-11.0.1.tgz#8ff3131f3d9b4b25fd28c64c4a9bdfe36da54942"
+  integrity sha512-WwxVx/aToxTjWmB5+O+3rOjSYdF8FC/Yd/8jF1ZGQMtLWAzP8/foQmKvPAktTUsh0/Ijhtur7LrHN2VuUedMcA==
   dependencies:
     "@ant-design/colors" "^5.0.0"
     tslib "^2.0.0"
@@ -1413,7 +1424,7 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d"
   integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==
 
-"@fortawesome/fontawesome-free@^5.15.4":
+"@fortawesome/fontawesome-free@^5.14.0":
   version "5.15.4"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
   integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==
@@ -1444,22 +1455,29 @@
     merge-source-map "^1.1.0"
     schema-utils "^2.7.0"
 
-"@ng-bootstrap/ng-bootstrap@11.0.0-beta.2":
-  version "11.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-11.0.0-beta.2.tgz#4d0c1f23a050e2e07ea22cc0c017e0b3685cdbf9"
-  integrity sha512-H6Kdzw4DBsUIrlvoxEJHCValSTHq0XcsiTVNbb99PjgD6ZhkBjINenT0W62A91k0nQEQBZCjhGGv+aNU/XxQNg==
+"@ng-bootstrap/ng-bootstrap@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-7.0.0.tgz#3bfa62eb52fdb891b1ce693ea11c39127e2d1ab7"
+  integrity sha512-SxUaptGWJmCxM0d2Zy1mx7K7p/YBwGZ69NmmBQVY4BE6p5av0hWrVmv9rzzfBz0rhxU7RPZLor2Jpaoq8Xyl4w==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.0.0"
 
 "@ngtools/webpack@12.2.14":
   version "12.2.14"
   resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-12.2.14.tgz#5ee931d650a3d0a5ac18af4ff6c936818d6d886a"
   integrity sha512-dla6JgLWKAo7k4K3O+ouo104wO3BFs+MIOCXoGF4Lp/1pKPSt0orYmvZFBkDZPmyBFYRw9wpL2WHnAAyip40Cw==
 
-"@ngx-validate/core@^0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@ngx-validate/core/-/core-0.1.1.tgz#bb7615e4fcca86fe21319b99a3c2c0cb8dc31285"
-  integrity sha512-632XUkV/QEIwAawESvFs7mGonDJZao/J/1kb6UgBSF3CYe9ub6alLf1T/5HMmyHpmBujNaFZndJpd28pdvPptA==
+"@ngx-validate/core@^0.0.13":
+  version "0.0.13"
+  resolved "https://registry.yarnpkg.com/@ngx-validate/core/-/core-0.0.13.tgz#954c6d247df8107668f23a39db24ca45c274f3d9"
+  integrity sha512-H0RohQz1AAx8J5KlbP0+hcApukA5uVxWg2eQve5YuKYpaD4sC8T613ZzoJEFVua5AfKbWqMXm4hx8mG3ISm7Ig==
+  dependencies:
+    tslib "^1.9.0"
+
+"@ngxs/store@^3.7.0":
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/@ngxs/store/-/store-3.7.3.tgz#74e2878d527fc12dace343ce43fd79fa1a2645af"
+  integrity sha512-JjATXC7FsxxQu2SaayP/iLe4O+5/RkRov3/J7WkaQmV6/JWFNkkdOwbEa6pDbh/po0JO7DHHMk3huIUNpDu67g==
   dependencies:
     tslib "^1.9.0"
 
@@ -1599,12 +1617,10 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.2.0.tgz#667bfc6186ae7c9e0b45a08960c551437176e1ca"
   integrity sha512-VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw==
 
-"@swimlane/ngx-datatable@^19.0.0":
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/@swimlane/ngx-datatable/-/ngx-datatable-19.0.0.tgz#7eed84ba276ebb9e4761233f8ac95d38fdff45b7"
-  integrity sha512-S8eknIQeZtr5aPZgBUItHmt+aQwrI32Hm3jvrxqJXK9J43oDzhIKT2qR1rre3s0XlBn6Zl8LAbmlKotQ5nnxnQ==
-  dependencies:
-    tslib "^2.0.0"
+"@swimlane/ngx-datatable@^17.1.0":
+  version "17.1.0"
+  resolved "https://registry.yarnpkg.com/@swimlane/ngx-datatable/-/ngx-datatable-17.1.0.tgz#ef2f91c3783526e7e89ac7a62a53e7bc9e1c90d5"
+  integrity sha512-zYUS7uNO9OJ5UQZFuuTRjlPu6vdKA+FHYLfeEs7PgSuUiDCcbl2SWoUdS/3zIoWn/qQyws767ueWiAvvWUbpEw==
 
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.6"
@@ -2034,12 +2050,11 @@ alphanum-sort@^1.0.2:
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
-angular-oauth2-oidc@^12.1.0:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/angular-oauth2-oidc/-/angular-oauth2-oidc-12.1.0.tgz#d15b40e52c149187303d4511dd0e4d9661281fc6"
-  integrity sha512-YUsNTWx8lccgo4e3qHvqJ6DOR9nfPVd+riyXzcy5nI4CB9cc2+SxaxiqQMGPAaKI2EOIfdxNobmUqUSEO+IXxA==
+angular-oauth2-oidc@^10.0.0:
+  version "10.0.3"
+  resolved "https://registry.yarnpkg.com/angular-oauth2-oidc/-/angular-oauth2-oidc-10.0.3.tgz#612ef75c2e07b56592d2506f9618ee6a61857ad9"
+  integrity sha512-9wC8I3e3cN6rMBOlo5JB2y3Fd2erp8pJ67t4vEVzyPbnRG6BJ4rreSOznSL9zw/2SjhC9kRV2OfFie29CUCzEg==
   dependencies:
-    fast-sha256 "^1.3.0"
     tslib "^2.0.0"
 
 ansi-colors@4.1.1, ansi-colors@^4.1.1:
@@ -2440,10 +2455,10 @@ boolbase@^1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-bootstrap@^5.1.1:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34"
-  integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==
+bootstrap@~4.6.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.1.tgz#bc25380c2c14192374e8dec07cf01b2742d222a2"
+  integrity sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -2693,10 +2708,28 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chart.js@^3.5.1:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.6.2.tgz#47342c551f688ffdda2cd53b534cb7e461ecec33"
-  integrity sha512-Xz7f/fgtVltfQYWq0zL1Xbv7N2inpG+B54p3D5FSvpCdy3sM+oZhbqa42eNuYXltaVvajgX5UpKCU2GeeJIgxg==
+chart.js@^2.9.3:
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684"
+  integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==
+  dependencies:
+    chartjs-color "^2.1.0"
+    moment "^2.10.2"
+
+chartjs-color-string@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
+  integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
+  dependencies:
+    color-name "^1.0.0"
+
+chartjs-color@^2.1.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
+  integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
+  dependencies:
+    chartjs-color-string "^0.6.0"
+    color-convert "^1.9.3"
 
 "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1:
   version "3.5.2"
@@ -2855,7 +2888,7 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.9.0:
+color-convert@^1.9.0, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -2874,7 +2907,7 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@~1.1.4:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -4052,11 +4085,6 @@ fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-sha256@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/fast-sha256/-/fast-sha256-1.3.0.tgz#7916ba2054eeb255982608cccd0f6660c79b7ae6"
-  integrity sha512-n11RGP/lrWEFI/bWdygLxhI+pVeo1ZYIVwvvPkW7azl/rOy+F3HYRZ2K5zeE9mmkhQppyv9sQFx0JM9UabnpPQ==
-
 fastparse@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
@@ -4338,6 +4366,18 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
+glob@7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@7.1.7:
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
@@ -5356,12 +5396,12 @@ jszip@^3.1.3:
     readable-stream "~2.3.6"
     set-immediate-shim "~1.0.1"
 
-just-clone@^3.2.1:
+just-clone@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/just-clone/-/just-clone-3.2.1.tgz#7396be5790d33f0fa7e8a145d7983b986a8cee39"
   integrity sha512-PFotEVrrzAnwuWTUOFquDShWrHnUnhxNrVs1VFqkNfnoH3Sn5XUlDOePYn2Vv5cN8xV2y69jf8qEoQHm7eoLnw==
 
-just-compare@^1.3.0, just-compare@^1.4.0:
+just-compare@^1.3.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/just-compare/-/just-compare-1.5.1.tgz#aed7e93e6bae9c3b69d79aea7805684132a0c0c5"
   integrity sha512-xDEEFHNIyJNmN4uo/2RVeUcay9THtN/5ka/iw98Y/gsa8w9KXZQuyaf5eFUY6VlntA2+G+bdPmdhqqTs7T+BRw==
@@ -5950,6 +5990,11 @@ mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+moment@^2.10.2:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -6068,15 +6113,16 @@ ng-packagr@^12.2.2:
   optionalDependencies:
     esbuild "0.13.8"
 
-ng-zorro-antd@^12.0.1:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/ng-zorro-antd/-/ng-zorro-antd-12.1.0.tgz#64dd19e4da6d80215a1b3a76fad1257b670b40ff"
-  integrity sha512-tsL57G4RmnB+lfGsC0onxYIdZ32L1CbrZUW35I3lwn8pB37qU2W87u1AYDulZHlQbz7CMHhjEnnucYPWu3Ak3g==
+ng-zorro-antd@^11.0.0:
+  version "11.4.2"
+  resolved "https://registry.yarnpkg.com/ng-zorro-antd/-/ng-zorro-antd-11.4.2.tgz#c19f12fee9166cbed0b6c7c63fa37da0464413e7"
+  integrity sha512-1dMIz5zBma+CfUYYKmIKWIB9mXX837L+WKGGHhl2KrmIIbsbNLh3WTKudCBuyqL58EEgiVhTZYwl841xdz+vLw==
   dependencies:
-    "@angular/cdk" "^12.1.0"
-    "@ant-design/icons-angular" "^12.0.3"
+    "@angular/cdk" "^11.0.2"
+    "@ant-design/icons-angular" "^11.0.1"
     date-fns "^2.10.0"
-    tslib "^2.2.0"
+    resize-observer-polyfill "^1.5.1"
+    tslib "^2.0.0"
 
 nice-napi@^1.0.2:
   version "1.0.2"
@@ -7601,6 +7647,11 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
+resize-observer-polyfill@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
+  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
+
 resolve-alpn@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
@@ -8027,6 +8078,11 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
+snq@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/snq/-/snq-1.0.3.tgz#f9661d10eebb224c52fc3c50106445c268618168"
+  integrity sha512-bXcxd1ppFnSNYKq84HyOYuYtbMHCFTZvuPSNCn/80yx9+DLkU/hLqjqCRKRHSDISrL1T/lWGXJyQxWS8TnutFA==
+
 socket.io-adapter@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz#4d6111e4d42e9f7646e365b4f578269821f13486"
@@ -8596,7 +8652,7 @@ tslib@^1.10.0, tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0:
+tslib@^2.0.0, tslib@^2.2.0, tslib@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
@@ -9138,7 +9194,7 @@ yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.1.2:
+yargs-parser@^18.1.0, yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
   integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
@@ -9156,6 +9212,23 @@ yargs-parser@^21.0.0:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55"
   integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==
 
+yargs@15.3.0:
+  version "15.3.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.0.tgz#403af6edc75b3ae04bf66c94202228ba119f0976"
+  integrity sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.0"
+
 yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..0b7d07c7
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@ngxs/store": "^3.7.3"
+  }
+}
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 00000000..4c3b6dcd
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,15 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@ngxs/store@^3.7.3":
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/@ngxs/store/-/store-3.7.3.tgz#74e2878d527fc12dace343ce43fd79fa1a2645af"
+  integrity sha512-JjATXC7FsxxQu2SaayP/iLe4O+5/RkRov3/J7WkaQmV6/JWFNkkdOwbEa6pDbh/po0JO7DHHMk3huIUNpDu67g==
+  dependencies:
+    tslib "^1.9.0"
+
+tslib@^1.9.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

From f03c0f756ed0b762c002ebca91f123c5d7fbe4c9 Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Fri, 10 Dec 2021 16:21:57 +0300
Subject: [PATCH 2/3] feat: use lepton-x instead of theme basic

---
 apps/angular/angular.json                     |  8 ++--
 apps/angular/package.json                     |  1 +
 .../config/src/providers/route.provider.ts    |  2 +
 apps/angular/src/app/app.module.ts            |  8 +++-
 apps/angular/yarn.lock                        | 39 ++++++++++++++++++-
 5 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/apps/angular/angular.json b/apps/angular/angular.json
index 6884a1fd..310a14ad 100644
--- a/apps/angular/angular.json
+++ b/apps/angular/angular.json
@@ -55,11 +55,9 @@
                 "inject": false,
                 "bundleName": "bootstrap-rtl.min"
               },
-              {
-                "input": "node_modules/bootstrap/dist/css/bootstrap.min.css",
-                "inject": true,
-                "bundleName": "bootstrap-ltr.min"
-              },
+              "node_modules/@volo/ngx-lepton-x.lite/styles/sidemenu-layout.min.css",
+              "node_modules/bootstrap-icons/font/bootstrap-icons.css",
+
               "src/styles.scss"
             ],
             "scripts": [],
diff --git a/apps/angular/package.json b/apps/angular/package.json
index 198e3df3..54a67899 100644
--- a/apps/angular/package.json
+++ b/apps/angular/package.json
@@ -19,6 +19,7 @@
     "@abp/ng.setting-management": "4.4.4",
     "@abp/ng.tenant-management": "4.4.4",
     "@abp/ng.theme.basic": "4.4.4",
+    "@abp/ng.theme.lepton-x": "^1.0.0-alpha.2",
     "@abp/ng.theme.shared": "4.4.4",
     "@angular/animations": "~12.2.8",
     "@angular/common": "~12.2.8",
diff --git a/apps/angular/projects/catalog/config/src/providers/route.provider.ts b/apps/angular/projects/catalog/config/src/providers/route.provider.ts
index 3aacd0ad..904ebf10 100644
--- a/apps/angular/projects/catalog/config/src/providers/route.provider.ts
+++ b/apps/angular/projects/catalog/config/src/providers/route.provider.ts
@@ -15,6 +15,7 @@ export function configureRoutes(routesService: RoutesService) {
         name: eCatalogRouteNames.Catalog,
         layout: eLayoutType.application,
         parentName: null,
+        iconClass: 'bi bi-collection-fill',
         requiredPolicy: eCatalogPolicyNames.Catalog,
       },
       {
@@ -23,6 +24,7 @@ export function configureRoutes(routesService: RoutesService) {
         parentName: eCatalogRouteNames.Catalog,
         order: 1,
         requiredPolicy: eCatalogPolicyNames.ProductManagement,
+        iconClass: 'bi bi-tag-fill',
       },
     ]);
   };
diff --git a/apps/angular/src/app/app.module.ts b/apps/angular/src/app/app.module.ts
index 0b8c697a..495a8df1 100644
--- a/apps/angular/src/app/app.module.ts
+++ b/apps/angular/src/app/app.module.ts
@@ -4,7 +4,9 @@ import { registerLocale } from '@abp/ng.core/locale';
 import { IdentityConfigModule } from '@abp/ng.identity/config';
 import { SettingManagementConfigModule } from '@abp/ng.setting-management/config';
 import { TenantManagementConfigModule } from '@abp/ng.tenant-management/config';
-import { ThemeBasicModule } from '@abp/ng.theme.basic';
+import { ThemeLeptonXModule } from '@abp/ng.theme.lepton-x';
+import { AccountLayoutModule } from '@abp/ng.theme.lepton-x/account';
+import { SideMenuLayoutModule } from '@abp/ng.theme.lepton-x/layouts';
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
@@ -30,7 +32,9 @@ import { APP_ROUTE_PROVIDER } from './route.provider';
     IdentityConfigModule.forRoot(),
     TenantManagementConfigModule.forRoot(),
     SettingManagementConfigModule.forRoot(),
-    ThemeBasicModule.forRoot(),
+    ThemeLeptonXModule.forRoot(),
+    SideMenuLayoutModule.forRoot(),
+    AccountLayoutModule.forRoot(),
     CatalogConfigModule.forRoot(),
     NgxsModule.forRoot(),
   ],
diff --git a/apps/angular/yarn.lock b/apps/angular/yarn.lock
index e19dc085..ea6c6962 100644
--- a/apps/angular/yarn.lock
+++ b/apps/angular/yarn.lock
@@ -104,6 +104,14 @@
     "@abp/ng.theme.shared" "~4.4.4"
     tslib "^2.0.0"
 
+"@abp/ng.theme.lepton-x@^1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.yarnpkg.com/@abp/ng.theme.lepton-x/-/ng.theme.lepton-x-1.0.0-alpha.2.tgz#8422837050b4611cf3118920c23503fe063fa8c5"
+  integrity sha512-ayjb5AXbsk6Y9ScH2eKIjOISrX2cHlK3XMWGeF0taiXuHqtcSxR6taQfkzJdV0YS5DtaDDeVa4U8fSCHFXaAMQ==
+  dependencies:
+    "@volo/ngx-lepton-x.lite" "1.0.0-alpha.2"
+    tslib "^2.1.0"
+
 "@abp/ng.theme.shared@4.4.4", "@abp/ng.theme.shared@~4.4.4":
   version "4.4.4"
   resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-4.4.4.tgz#45abe515727d8ef4a1764bb012bd7f2ffd16ce9b"
@@ -1790,6 +1798,23 @@
     "@types/source-list-map" "*"
     source-map "^0.6.1"
 
+"@volo/ngx-lepton-x.core@1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.yarnpkg.com/@volo/ngx-lepton-x.core/-/ngx-lepton-x.core-1.0.0-alpha.2.tgz#4bb2ac4032ed9b44a3f50a8f7dfb7cfd8d02a39a"
+  integrity sha512-FfT34ojpNZ/mhNfpg3eevhMrfXe3s+q51EGXIPqW7WHZwuq7dSAb44X1gF+8iRRbCC7h5M1OV/S3uGk1NN81OA==
+  dependencies:
+    bootstrap-icons "^1.5.0"
+    ng-observe "^1.0.1"
+    tslib "^2.0.0"
+
+"@volo/ngx-lepton-x.lite@1.0.0-alpha.2":
+  version "1.0.0-alpha.2"
+  resolved "https://registry.yarnpkg.com/@volo/ngx-lepton-x.lite/-/ngx-lepton-x.lite-1.0.0-alpha.2.tgz#77ef0591e83ba0a419b522729c98f6e9dbc70fff"
+  integrity sha512-DGayNfBKa8qgRPrZr9ufwP5w36G1YNXWh6qLJdqA5G8tFrlnYKlzezRuNmwiunF2j0FLjBRZpgWRRbEUBO4pwA==
+  dependencies:
+    "@volo/ngx-lepton-x.core" "1.0.0-alpha.2"
+    tslib "^2.0.0"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -2455,6 +2480,11 @@ boolbase@^1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
+bootstrap-icons@^1.5.0:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/bootstrap-icons/-/bootstrap-icons-1.7.2.tgz#4024e081e2c850602552e1fed6451e682d09322a"
+  integrity sha512-NiR2PqC73AQOPdVSu6GJfnk+hN2z6powcistXk1JgPnKuoV2FSdSl26w931Oz9HYbKCcKUSB6ncZTYJAYJl3QQ==
+
 bootstrap@~4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.1.tgz#bc25380c2c14192374e8dec07cf01b2742d222a2"
@@ -6079,6 +6109,13 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
+ng-observe@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ng-observe/-/ng-observe-1.1.0.tgz#56714d40d33bc4bd7343d00e6db1387a53ee56b3"
+  integrity sha512-PNZwzcRmAK4dRZsR7GKirqd+kzHEi41Om3i5as+Q0jJCyrlE3Au7nLtEh4KugCroqNnG1c9UB8HMAKFHxSo4Uw==
+  dependencies:
+    tslib "^2.0.0"
+
 ng-packagr@^12.2.2:
   version "12.2.6"
   resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-12.2.6.tgz#e3e6d8cdcf32df7c8ec6a7419b6bb3d6dc586224"
@@ -8652,7 +8689,7 @@ tslib@^1.10.0, tslib@^1.13.0, tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.2.0, tslib@^2.3.0:
+tslib@^2.0.0, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==

From 0367b7110c0a2a6a61e5151b3a8e41780a1f0790 Mon Sep 17 00:00:00 2001
From: bnymncoskuner <bnymncoskuner@gmail.com>
Date: Fri, 10 Dec 2021 16:22:07 +0300
Subject: [PATCH 3/3] feat: enable resource owner flow

---
 apps/angular/src/environments/environment.ts                  | 4 ++--
 .../DbMigrations/IdentityServerDataSeeder.cs                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/angular/src/environments/environment.ts b/apps/angular/src/environments/environment.ts
index 4d46999e..a3b4f13d 100644
--- a/apps/angular/src/environments/environment.ts
+++ b/apps/angular/src/environments/environment.ts
@@ -12,9 +12,9 @@ export const environment = {
     issuer: 'https://localhost:44330',
     redirectUri: baseUrl,
     clientId: 'Web',
-    responseType: 'code',
+    //responseType: 'code',
     scope: 'offline_access openid profile email phone IdentityService AdministrationService',
-    requireHttps: true,
+    //requireHttps: true,
   },
   apis: {
     default: {
diff --git a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs
index 17911b0d..70bf3231 100644
--- a/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs
+++ b/services/identity/src/EShopOnAbp.IdentityService.HttpApi.Host/DbMigrations/IdentityServerDataSeeder.cs
@@ -238,7 +238,7 @@ namespace EShopOnAbp.IdentityService.DbMigrations
                     "IdentityService",
                     "AdministrationService"
                 }),
-                grantTypes: new[] { "authorization_code", "LinkLogin" },
+                grantTypes: new[] { "authorization_code", "LinkLogin", "password" },
                 secret: "1q2w3e*".Sha256(),
                 requirePkce: true,
                 requireClientSecret: false,