Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-09-22 05:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: update to Angular 14 (#5973)

Browse source 
* fix: fix issues after updates to Angular 13 in rooms component and country orders component

* feat: update to Angular 14 (#1)

* fix(angular 13): fix issues after updates to Angular 13 in rooms component and country orders component (#5965)

* feat: update to Angular 14

* feat: update angular eslint packages eslint

* feat: update nebular to 10 version

* feat: update style import, remove ~
This commit is contained in:
Denis Strigo 2023-03-07 19:26:27 +01:00 • committed by GitHub
parent 384b841cc0
commit b1a9a682b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 2609 additions and 2723 deletions
Download patch file Download diff file Expand all files Collapse all files

1
angular.json
View file

@ -173,7 +173,6 @@
} }
} }
}, },
"defaultProject": "ngx-admin-demo",
"schematics": { "schematics": {
"@schematics/angular:component": { "@schematics/angular:component": {
"prefix": "ngx", "prefix": "ngx",

5112
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

48
package.json
View file

@ -30,21 +30,21 @@
"postinstall": "ngcc --properties es2015 es5 browser module main --first-only --create-ivy-entry-points --tsconfig \"./src/tsconfig.app.json\"" "postinstall": "ngcc --properties es2015 es5 browser module main --first-only --create-ivy-entry-points --tsconfig \"./src/tsconfig.app.json\""
}, },
"dependencies": { "dependencies": {
"@angular/animations": "^13.3.12", "@angular/animations": "^14.2.12",
"@angular/cdk": "12.1.0", "@angular/cdk": "12.1.0",
"@angular/common": "^13.3.12", "@angular/common": "^14.2.12",
"@angular/compiler": "^13.3.12", "@angular/compiler": "^14.2.12",
"@angular/core": "^13.3.12", "@angular/core": "^14.2.12",
"@angular/forms": "^13.3.12", "@angular/forms": "^14.2.12",
"@angular/google-maps": "^12.2.13", "@angular/google-maps": "^12.2.13",
"@angular/platform-browser": "^13.3.12", "@angular/platform-browser": "^14.2.12",
"@angular/platform-browser-dynamic": "^13.3.12", "@angular/platform-browser-dynamic": "^14.2.12",
"@angular/router": "^13.3.12", "@angular/router": "^14.2.12",
"@asymmetrik/ngx-leaflet": "3.0.1", "@asymmetrik/ngx-leaflet": "3.0.1",
"@nebular/auth": "9.1.0-rc.8", "@nebular/auth": "10.0.0",
"@nebular/eva-icons": "9.1.0-rc.8", "@nebular/eva-icons": "10.0.0",
"@nebular/security": "9.1.0-rc.8", "@nebular/security": "10.0.0",
"@nebular/theme": "9.1.0-rc.8", "@nebular/theme": "10.0.0",
"@swimlane/ngx-charts": "^14.0.0", "@swimlane/ngx-charts": "^14.0.0",
"angular2-chartjs": "0.4.1", "angular2-chartjs": "0.4.1",
"bootstrap": "4.3.1", "bootstrap": "4.3.1",
@ -77,15 +77,15 @@
"zone.js": "~0.11.4" "zone.js": "~0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^13.3.10", "@angular-devkit/build-angular": "^14.2.10",
"@angular-eslint/builder": "13.5.0", "@angular-eslint/builder": "14.4.0",
"@angular-eslint/eslint-plugin": "13.5.0", "@angular-eslint/eslint-plugin": "14.4.0",
"@angular-eslint/eslint-plugin-template": "13.5.0", "@angular-eslint/eslint-plugin-template": "14.4.0",
"@angular-eslint/schematics": "13.5.0", "@angular-eslint/schematics": "14.4.0",
"@angular-eslint/template-parser": "13.5.0", "@angular-eslint/template-parser": "14.4.0",
"@angular/cli": "^13.3.10", "@angular/cli": "^14.2.10",
"@angular/compiler-cli": "^13.3.12", "@angular/compiler-cli": "^14.2.12",
"@angular/language-service": "13.3.12", "@angular/language-service": "14.2.12",
"@compodoc/compodoc": "1.0.1", "@compodoc/compodoc": "1.0.1",
"@fortawesome/fontawesome-free": "^5.2.0", "@fortawesome/fontawesome-free": "^5.2.0",
"@types/d3-color": "1.0.5", "@types/d3-color": "1.0.5",
@ -93,11 +93,11 @@
"@types/jasminewd2": "2.0.3", "@types/jasminewd2": "2.0.3",
"@types/leaflet": "1.2.3", "@types/leaflet": "1.2.3",
"@types/node": "^12.12.70", "@types/node": "^12.12.70",
"@typescript-eslint/eslint-plugin": "5.27.1", "@typescript-eslint/eslint-plugin": "^5.36.2",
"@typescript-eslint/parser": "5.27.1", "@typescript-eslint/parser": "^5.36.2",
"codelyzer": "^6.0.2", "codelyzer": "^6.0.2",
"conventional-changelog-cli": "1.3.4", "conventional-changelog-cli": "1.3.4",
"eslint": "^8.17.0", "eslint": "^8.23.0",
"husky": "0.13.3", "husky": "0.13.3",
"jasmine-core": "~3.6.0", "jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0", "jasmine-spec-reporter": "~5.0.0",

4
src/app/@theme/components/footer/footer.component.scss
View file

@ -1,6 +1,6 @@
@import '../../styles/themes'; @import '../../styles/themes';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@include nb-install-component() { @include nb-install-component() {
width: 100%; width: 100%;

4
src/app/@theme/components/header/header.component.scss
View file

@ -1,5 +1,5 @@
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@import '../../styles/themes'; @import '../../styles/themes';
@include nb-install-component() { @include nb-install-component() {

4
src/app/@theme/layouts/one-column/one-column.layout.scss
View file

@ -1,6 +1,6 @@
@import '../../styles/themes'; @import '../../styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
.menu-sidebar ::ng-deep .scrollable { .menu-sidebar ::ng-deep .scrollable {

4
src/app/@theme/layouts/three-columns/three-columns.layout.scss
View file

@ -1,6 +1,6 @@
@import '../../styles/themes'; @import '../../styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
.menu-sidebar ::ng-deep .scrollable { .menu-sidebar ::ng-deep .scrollable {

4
src/app/@theme/layouts/two-columns/two-columns.layout.scss
View file

@ -1,6 +1,6 @@
@import '../../styles/themes'; @import '../../styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
.menu-sidebar ::ng-deep .scrollable { .menu-sidebar ::ng-deep .scrollable {

12
src/app/@theme/styles/styles.scss
View file

@ -4,13 +4,13 @@
@import 'themes'; @import 'themes';
// framework component themes (styles tied to theme variables) // framework component themes (styles tied to theme variables)
@import '~@nebular/theme/styles/globals'; @import '@nebular/theme/styles/globals';
@import '~@nebular/auth/styles/globals'; @import '@nebular/auth/styles/globals';
@import '~bootstrap/scss/functions'; @import 'bootstrap/scss/functions';
@import '~bootstrap/scss/variables'; @import 'bootstrap/scss/variables';
@import '~bootstrap/scss/mixins'; @import 'bootstrap/scss/mixins';
@import '~bootstrap/scss/grid'; @import 'bootstrap/scss/grid';
// loading progress bar theme // loading progress bar theme
@import './pace.theme'; @import './pace.theme';

4
src/app/@theme/styles/themes.scss
View file

@ -1,7 +1,7 @@
// @nebular theming framework // @nebular theming framework
@import '~@nebular/theme/styles/theming'; @import '@nebular/theme/styles/theming';
// @nebular out of the box themes // @nebular out of the box themes
@import '~@nebular/theme/styles/themes'; @import '@nebular/theme/styles/themes';
$nb-themes: nb-register-theme(( $nb-themes: nb-register-theme((
layout-padding-top: 2.25rem, layout-padding-top: 2.25rem,

4
src/app/pages/dashboard/dashboard.component.scss
View file

@ -1,6 +1,6 @@
@import '../../@theme/styles/themes'; @import '../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
.solar-card nb-card-header { .solar-card nb-card-header {

4
src/app/pages/dashboard/electricity/electricity.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {

4
src/app/pages/dashboard/rooms/player/player.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../../@theme/styles/themes'; @import '../../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
height: 100%; height: 100%;

4
src/app/pages/dashboard/rooms/rooms.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
ngx-room-selector { ngx-room-selector {

4
src/app/pages/dashboard/security-cameras/security-cameras.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@include nb-install-component() { @include nb-install-component() {

4
src/app/pages/dashboard/solar/solar.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@include nb-install-component() { @include nb-install-component() {

4
src/app/pages/dashboard/temperature/temperature.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {

4
src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../../@theme/styles/themes'; @import '../../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
padding: 1.5rem 4.5rem; padding: 1.5rem 4.5rem;

4
src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../../@theme/styles/themes'; @import '../../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
display: flex; display: flex;

4
src/app/pages/e-commerce/country-orders/country-orders.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {

4
src/app/pages/e-commerce/country-orders/map/country-orders-map.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../../@theme/styles/themes'; @import '../../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {

4
src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../../@theme/styles/themes'; @import '../../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
ngx-earning-pie-chart, ngx-earning-pie-chart,

2
src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.scss
View file

@ -1,5 +1,5 @@
@import '../../../../@theme/styles/themes'; @import '../../../../@theme/styles/themes';
@import '~@nebular/theme/styles/global/typography/typography'; @import '@nebular/theme/styles/global/typography/typography';
@include nb-install-component() { @include nb-install-component() {
display: flex; display: flex;

4
src/app/pages/e-commerce/legend-chart/legend-chart.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
display: flex; display: flex;

4
src/app/pages/e-commerce/slide-out/slide-out.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
$slide-out-container-width: 40%; $slide-out-container-width: 40%;

4
src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.scss
View file

@ -1,5 +1,5 @@
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@import '../../../../@theme/styles/themes'; @import '../../../../@theme/styles/themes';
@include nb-install-component() { @include nb-install-component() {

4
src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
position: relative; position: relative;

7
src/app/pages/extra-components/calendar-kit/calendar-kit.component.ts
View file

@ -2,10 +2,9 @@ import { Component } from '@angular/core';
import { CalendarKitMonthCellComponent } from './month-cell/month-cell.component'; import { CalendarKitMonthCellComponent } from './month-cell/month-cell.component';
@Component({ @Component({
selector: 'ngx-calendar-kit', selector: 'ngx-calendar-kit',
templateUrl: 'calendar-kit.component.html', templateUrl: 'calendar-kit.component.html',
styleUrls: ['calendar-kit.component.scss'], styleUrls: ['calendar-kit.component.scss'],
entryComponents: [CalendarKitMonthCellComponent],
}) })
export class CalendarKitFullCalendarShowcaseComponent { export class CalendarKitFullCalendarShowcaseComponent {
month = new Date(); month = new Date();

4
src/app/pages/extra-components/calendar/calendar.component.scss
View file

@ -1,5 +1,5 @@
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';
@include nb-install-component() { @include nb-install-component() {

7
src/app/pages/extra-components/calendar/calendar.component.ts
View file

@ -3,10 +3,9 @@ import { NbCalendarRange, NbDateService } from '@nebular/theme';
import { DayCellComponent } from './day-cell/day-cell.component'; import { DayCellComponent } from './day-cell/day-cell.component';
@Component({ @Component({
selector: 'ngx-calendar', selector: 'ngx-calendar',
templateUrl: 'calendar.component.html', templateUrl: 'calendar.component.html',
styleUrls: ['calendar.component.scss'], styleUrls: ['calendar.component.scss'],
entryComponents: [DayCellComponent],
}) })
export class CalendarComponent { export class CalendarComponent {

4
src/app/pages/extra-components/chat/chat.component.scss
View file

@ -1,5 +1,5 @@
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';

10
src/app/pages/layout/stepper/stepper.component.ts
View file

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
@Component({ @Component({
selector: 'ngx-stepper', selector: 'ngx-stepper',
@ -8,11 +8,11 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
}) })
export class StepperComponent implements OnInit { export class StepperComponent implements OnInit {
firstForm: FormGroup; firstForm: UntypedFormGroup;
secondForm: FormGroup; secondForm: UntypedFormGroup;
thirdForm: FormGroup; thirdForm: UntypedFormGroup;
constructor(private fb: FormBuilder) { constructor(private fb: UntypedFormBuilder) {
} }
ngOnInit() { ngOnInit() {

4
src/app/pages/modal-overlays/dialog/dialog.component.scss
View file

@ -1,5 +1,5 @@
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';

21
src/app/pages/modal-overlays/modal-overlays.module.ts
View file

@ -77,18 +77,15 @@ const SERVICES = [
]; ];
@NgModule({ @NgModule({
imports: [ imports: [
...MODULES, ...MODULES,
], ],
declarations: [ declarations: [
...COMPONENTS, ...COMPONENTS,
], ],
providers: [ providers: [
...SERVICES, ...SERVICES,
], ],
entryComponents: [
...ENTRY_COMPONENTS,
],
}) })
export class ModalOverlaysModule { export class ModalOverlaysModule {
} }

2
src/app/pages/modal-overlays/popovers/popovers.component.scss
View file

@ -1,4 +1,4 @@
@import '~@nebular/theme/styles/core/mixins'; @import '@nebular/theme/styles/core/mixins';
nb-card-body { nb-card-body {
margin: 0 -0.5rem; margin: 0 -0.5rem;

4
src/app/pages/modal-overlays/toastr/toastr.component.scss
View file

@ -1,6 +1,6 @@
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@include nb-install-component() { @include nb-install-component() {
.position-select { .position-select {

4
src/app/pages/modal-overlays/window/window.component.scss
View file

@ -1,5 +1,5 @@
@import '~bootstrap/scss/mixins/breakpoints'; @import 'bootstrap/scss/mixins/breakpoints';
@import '~@nebular/theme/styles/global/breakpoints'; @import '@nebular/theme/styles/global/breakpoints';
@import '../../../@theme/styles/themes'; @import '../../../@theme/styles/themes';

2
tsconfig.json
View file

@ -8,7 +8,7 @@
"declaration": false, "declaration": false,
"moduleResolution": "node", "moduleResolution": "node",
"experimentalDecorators": true, "experimentalDecorators": true,
"target": "es2015", "target": "es2020",
"typeRoots": [ "typeRoots": [
"node_modules/@types" "node_modules/@types"
], ],