mirror of
https://github.com/akveo/ngx-admin.git
synced 2025-12-19 17:00:13 +01:00
Remove packages uncompatible with Ivy
This commit is contained in:
parent
99e85ac0fe
commit
d673c512ec
16 changed files with 62 additions and 69 deletions
5
package-lock.json
generated
5
package-lock.json
generated
|
|
@ -4,11 +4,6 @@
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@agm/core": {
|
|
||||||
"version": "1.0.0-beta.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/@agm/core/-/core-1.0.0-beta.5.tgz",
|
|
||||||
"integrity": "sha512-LVENJqtBZEWpX+uJkGI0zgg+Xkm2KkktQm4ojZozArbeNvQkVL6pqVc04Mme6vvOzwJpD1cET5w4byC8Xaq1QQ=="
|
|
||||||
},
|
|
||||||
"@angular-devkit/architect": {
|
"@angular-devkit/architect": {
|
||||||
"version": "0.900.4",
|
"version": "0.900.4",
|
||||||
"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.4.tgz",
|
"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.4.tgz",
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,6 @@
|
||||||
"postinstall": "ngcc --properties es2015 es5 browser module main --first-only --create-ivy-entry-points"
|
"postinstall": "ngcc --properties es2015 es5 browser module main --first-only --create-ivy-entry-points"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@agm/core": "^1.0.0-beta.5",
|
|
||||||
"@angular/animations": "^9.0.4",
|
"@angular/animations": "^9.0.4",
|
||||||
"@angular/cdk": "^8.0.0",
|
"@angular/cdk": "^8.0.0",
|
||||||
"@angular/common": "^9.0.4",
|
"@angular/common": "^9.0.4",
|
||||||
|
|
@ -60,8 +59,6 @@
|
||||||
"leaflet": "1.2.0",
|
"leaflet": "1.2.0",
|
||||||
"nebular-icons": "1.1.0",
|
"nebular-icons": "1.1.0",
|
||||||
"ng2-ckeditor": "^1.2.2",
|
"ng2-ckeditor": "^1.2.2",
|
||||||
"ng2-completer": "3.0.3",
|
|
||||||
"ng2-smart-table": "1.5.0",
|
|
||||||
"ngx-echarts": "^4.2.2",
|
"ngx-echarts": "^4.2.2",
|
||||||
"node-sass": "^4.12.0",
|
"node-sass": "^4.12.0",
|
||||||
"normalize.css": "6.0.0",
|
"normalize.css": "6.0.0",
|
||||||
|
|
|
||||||
|
|
@ -153,13 +153,16 @@ export const NB_CORE_PROVIDERS = [
|
||||||
NbAuthModule,
|
NbAuthModule,
|
||||||
],
|
],
|
||||||
declarations: [],
|
declarations: [],
|
||||||
|
providers: [
|
||||||
|
...NB_CORE_PROVIDERS
|
||||||
|
]
|
||||||
})
|
})
|
||||||
export class CoreModule {
|
export class CoreModule {
|
||||||
constructor(@Optional() @SkipSelf() parentModule: CoreModule) {
|
constructor(@Optional() @SkipSelf() parentModule: CoreModule) {
|
||||||
throwIfAlreadyLoaded(parentModule, 'CoreModule');
|
throwIfAlreadyLoaded(parentModule, 'CoreModule');
|
||||||
}
|
}
|
||||||
|
|
||||||
static forRoot(): ModuleWithProviders {
|
static forRoot(): ModuleWithProviders<CoreModule> {
|
||||||
return <ModuleWithProviders>{
|
return <ModuleWithProviders>{
|
||||||
ngModule: CoreModule,
|
ngModule: CoreModule,
|
||||||
providers: [
|
providers: [
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ const SERVICES = [
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class MockDataModule {
|
export class MockDataModule {
|
||||||
static forRoot(): ModuleWithProviders {
|
static forRoot(): ModuleWithProviders<MockDataModule> {
|
||||||
return <ModuleWithProviders>{
|
return <ModuleWithProviders>{
|
||||||
ngModule: MockDataModule,
|
ngModule: MockDataModule,
|
||||||
providers: [
|
providers: [
|
||||||
|
|
|
||||||
|
|
@ -74,9 +74,17 @@ const PIPES = [
|
||||||
imports: [CommonModule, ...NB_MODULES],
|
imports: [CommonModule, ...NB_MODULES],
|
||||||
exports: [CommonModule, ...PIPES, ...COMPONENTS],
|
exports: [CommonModule, ...PIPES, ...COMPONENTS],
|
||||||
declarations: [...COMPONENTS, ...PIPES],
|
declarations: [...COMPONENTS, ...PIPES],
|
||||||
|
providers: [
|
||||||
|
...NbThemeModule.forRoot(
|
||||||
|
{
|
||||||
|
name: 'default',
|
||||||
|
},
|
||||||
|
[ DEFAULT_THEME, COSMIC_THEME, CORPORATE_THEME, DARK_THEME ],
|
||||||
|
).providers,
|
||||||
|
]
|
||||||
})
|
})
|
||||||
export class ThemeModule {
|
export class ThemeModule {
|
||||||
static forRoot(): ModuleWithProviders {
|
static forRoot(): ModuleWithProviders<ThemeModule> {
|
||||||
return <ModuleWithProviders>{
|
return <ModuleWithProviders>{
|
||||||
ngModule: ThemeModule,
|
ngModule: ThemeModule,
|
||||||
providers: [
|
providers: [
|
||||||
|
|
|
||||||
|
|
@ -9,10 +9,10 @@ import {
|
||||||
NbResetPasswordComponent,
|
NbResetPasswordComponent,
|
||||||
} from '@nebular/auth';
|
} from '@nebular/auth';
|
||||||
|
|
||||||
const routes: Routes = [
|
export const routes: Routes = [
|
||||||
{
|
{
|
||||||
path: 'pages',
|
path: 'pages',
|
||||||
loadChildren: () => import('app/pages/pages.module')
|
loadChildren: () => import('./pages/pages.module')
|
||||||
.then(m => m.PagesModule),
|
.then(m => m.PagesModule),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -28,9 +28,6 @@ import {
|
||||||
BrowserAnimationsModule,
|
BrowserAnimationsModule,
|
||||||
HttpClientModule,
|
HttpClientModule,
|
||||||
AppRoutingModule,
|
AppRoutingModule,
|
||||||
|
|
||||||
ThemeModule.forRoot(),
|
|
||||||
|
|
||||||
NbSidebarModule.forRoot(),
|
NbSidebarModule.forRoot(),
|
||||||
NbMenuModule.forRoot(),
|
NbMenuModule.forRoot(),
|
||||||
NbDatepickerModule.forRoot(),
|
NbDatepickerModule.forRoot(),
|
||||||
|
|
@ -40,7 +37,8 @@ import {
|
||||||
NbChatModule.forRoot({
|
NbChatModule.forRoot({
|
||||||
messageGoogleMapKey: 'AIzaSyA_wNuCzia92MAmdLRzmqitRGvCF7wCZPY',
|
messageGoogleMapKey: 'AIzaSyA_wNuCzia92MAmdLRzmqitRGvCF7wCZPY',
|
||||||
}),
|
}),
|
||||||
CoreModule.forRoot(),
|
CoreModule,
|
||||||
|
ThemeModule,
|
||||||
],
|
],
|
||||||
bootstrap: [AppComponent],
|
bootstrap: [AppComponent],
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,9 @@ import { Component } from '@angular/core';
|
||||||
<nb-card>
|
<nb-card>
|
||||||
<nb-card-header>Google Maps</nb-card-header>
|
<nb-card-header>Google Maps</nb-card-header>
|
||||||
<nb-card-body>
|
<nb-card-body>
|
||||||
<agm-map [latitude]="lat" [longitude]="lng">
|
<!-- <agm-map [latitude]="lat" [longitude]="lng">
|
||||||
<agm-marker [latitude]="lat" [longitude]="lng"></agm-marker>
|
<agm-marker [latitude]="lat" [longitude]="lng"></agm-marker>
|
||||||
</agm-map>
|
</agm-map> -->
|
||||||
</nb-card-body>
|
</nb-card-body>
|
||||||
</nb-card>
|
</nb-card>
|
||||||
`,
|
`,
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { AgmCoreModule } from '@agm/core';
|
// import { AgmCoreModule } from '@agm/core';
|
||||||
import { LeafletModule } from '@asymmetrik/ngx-leaflet';
|
import { LeafletModule } from '@asymmetrik/ngx-leaflet';
|
||||||
import { NgxEchartsModule } from 'ngx-echarts';
|
import { NgxEchartsModule } from 'ngx-echarts';
|
||||||
import { NbCardModule } from '@nebular/theme';
|
import { NbCardModule } from '@nebular/theme';
|
||||||
|
|
@ -10,10 +10,10 @@ import { MapsRoutingModule, routedComponents } from './maps-routing.module';
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
ThemeModule,
|
ThemeModule,
|
||||||
AgmCoreModule.forRoot({
|
// AgmCoreModule.forRoot({
|
||||||
apiKey: 'AIzaSyCpVhQiwAllg1RAFaxMWSpQruuGARy0Y1k',
|
// apiKey: 'AIzaSyCpVhQiwAllg1RAFaxMWSpQruuGARy0Y1k',
|
||||||
libraries: ['places'],
|
// libraries: ['places'],
|
||||||
}),
|
// }),
|
||||||
LeafletModule.forRoot(),
|
LeafletModule.forRoot(),
|
||||||
MapsRoutingModule,
|
MapsRoutingModule,
|
||||||
NgxEchartsModule,
|
NgxEchartsModule,
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<agm-map [latitude]="latitude"
|
<!-- <agm-map [latitude]="latitude"
|
||||||
[longitude]="longitude"
|
[longitude]="longitude"
|
||||||
[scrollwheel]="false"
|
[scrollwheel]="false"
|
||||||
[zoom]="zoom">
|
[zoom]="zoom">
|
||||||
<agm-marker [latitude]="latitude"
|
<agm-marker [latitude]="latitude"
|
||||||
[longitude]="longitude"></agm-marker>
|
[longitude]="longitude"></agm-marker>
|
||||||
</agm-map>
|
</agm-map> -->
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { Component, ElementRef, EventEmitter, NgZone, OnInit, Output, ViewChild } from '@angular/core';
|
import { Component, ElementRef, EventEmitter, NgZone, OnInit, Output, ViewChild } from '@angular/core';
|
||||||
import { MapsAPILoader } from '@agm/core';
|
// import { MapsAPILoader } from '@agm/core';
|
||||||
import { Location } from '../entity/Location';
|
import { Location } from '../entity/Location';
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -14,31 +14,31 @@ export class SearchComponent implements OnInit {
|
||||||
@ViewChild('search', { static: true })
|
@ViewChild('search', { static: true })
|
||||||
public searchElementRef: ElementRef;
|
public searchElementRef: ElementRef;
|
||||||
|
|
||||||
constructor(private mapsAPILoader: MapsAPILoader,
|
constructor(// private mapsAPILoader: MapsAPILoader,
|
||||||
private ngZone: NgZone) {
|
private ngZone: NgZone) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
// load Places Autocomplete
|
// load Places Autocomplete
|
||||||
this.mapsAPILoader.load().then(() => {
|
// this.mapsAPILoader.load().then(() => {
|
||||||
const autocomplete = new google.maps.places.Autocomplete(this.searchElementRef.nativeElement, {
|
// const autocomplete = new google.maps.places.Autocomplete(this.searchElementRef.nativeElement, {
|
||||||
types: ['address'],
|
// types: ['address'],
|
||||||
});
|
// });
|
||||||
autocomplete.addListener('place_changed', () => {
|
// autocomplete.addListener('place_changed', () => {
|
||||||
this.ngZone.run(() => {
|
// this.ngZone.run(() => {
|
||||||
// get the place result
|
// // get the place result
|
||||||
const place: google.maps.places.PlaceResult = autocomplete.getPlace();
|
// const place: google.maps.places.PlaceResult = autocomplete.getPlace();
|
||||||
|
|
||||||
// verify result
|
// // verify result
|
||||||
if (place.geometry === undefined || place.geometry === null) {
|
// if (place.geometry === undefined || place.geometry === null) {
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
|
|
||||||
this.positionChanged.emit(
|
// this.positionChanged.emit(
|
||||||
new Location(place.geometry.location.lat(),
|
// new Location(place.geometry.location.lat(),
|
||||||
place.geometry.location.lng()));
|
// place.geometry.location.lng()));
|
||||||
});
|
// });
|
||||||
});
|
// });
|
||||||
});
|
// });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
</nb-card-header>
|
</nb-card-header>
|
||||||
|
|
||||||
<nb-card-body>
|
<nb-card-body>
|
||||||
<ng2-smart-table [settings]="settings" [source]="source" (deleteConfirm)="onDeleteConfirm($event)">
|
<!-- <ng2-smart-table [settings]="settings" [source]="source" (deleteConfirm)="onDeleteConfirm($event)">
|
||||||
</ng2-smart-table>
|
</ng2-smart-table> -->
|
||||||
</nb-card-body>
|
</nb-card-body>
|
||||||
</nb-card>
|
</nb-card>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { Component } from '@angular/core';
|
import { Component } from '@angular/core';
|
||||||
import { LocalDataSource } from 'ng2-smart-table';
|
// import { LocalDataSource } from 'ng2-smart-table';
|
||||||
|
|
||||||
import { SmartTableData } from '../../../@core/data/smart-table';
|
import { SmartTableData } from '../../../@core/data/smart-table';
|
||||||
|
|
||||||
|
|
@ -53,11 +53,11 @@ export class SmartTableComponent {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
source: LocalDataSource = new LocalDataSource();
|
// source: LocalDataSource = new LocalDataSource();
|
||||||
|
|
||||||
constructor(private service: SmartTableData) {
|
constructor(private service: SmartTableData) {
|
||||||
const data = this.service.getData();
|
// const data = this.service.getData();
|
||||||
this.source.load(data);
|
// this.source.load(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
onDeleteConfirm(event): void {
|
onDeleteConfirm(event): void {
|
||||||
|
|
|
||||||
|
|
@ -2,17 +2,17 @@ import { NgModule } from '@angular/core';
|
||||||
import { Routes, RouterModule } from '@angular/router';
|
import { Routes, RouterModule } from '@angular/router';
|
||||||
|
|
||||||
import { TablesComponent } from './tables.component';
|
import { TablesComponent } from './tables.component';
|
||||||
import { SmartTableComponent } from './smart-table/smart-table.component';
|
// import { SmartTableComponent } from './smart-table/smart-table.component';
|
||||||
import { TreeGridComponent } from './tree-grid/tree-grid.component';
|
import { TreeGridComponent } from './tree-grid/tree-grid.component';
|
||||||
|
|
||||||
const routes: Routes = [{
|
const routes: Routes = [{
|
||||||
path: '',
|
path: '',
|
||||||
component: TablesComponent,
|
component: TablesComponent,
|
||||||
children: [
|
children: [
|
||||||
{
|
// {
|
||||||
path: 'smart-table',
|
// path: 'smart-table',
|
||||||
component: SmartTableComponent,
|
// component: SmartTableComponent,
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
path: 'tree-grid',
|
path: 'tree-grid',
|
||||||
component: TreeGridComponent,
|
component: TreeGridComponent,
|
||||||
|
|
@ -28,6 +28,6 @@ export class TablesRoutingModule { }
|
||||||
|
|
||||||
export const routedComponents = [
|
export const routedComponents = [
|
||||||
TablesComponent,
|
TablesComponent,
|
||||||
SmartTableComponent,
|
// SmartTableComponent,
|
||||||
TreeGridComponent,
|
TreeGridComponent,
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { NbCardModule, NbIconModule, NbInputModule, NbTreeGridModule } from '@nebular/theme';
|
import { NbCardModule, NbIconModule, NbInputModule, NbTreeGridModule } from '@nebular/theme';
|
||||||
import { Ng2SmartTableModule } from 'ng2-smart-table';
|
// import { Ng2SmartTableModule } from 'ng2-smart-table';
|
||||||
|
|
||||||
import { ThemeModule } from '../../@theme/theme.module';
|
import { ThemeModule } from '../../@theme/theme.module';
|
||||||
import { TablesRoutingModule, routedComponents } from './tables-routing.module';
|
import { TablesRoutingModule, routedComponents } from './tables-routing.module';
|
||||||
|
|
@ -14,7 +14,7 @@ import { FsIconComponent } from './tree-grid/tree-grid.component';
|
||||||
NbInputModule,
|
NbInputModule,
|
||||||
ThemeModule,
|
ThemeModule,
|
||||||
TablesRoutingModule,
|
TablesRoutingModule,
|
||||||
Ng2SmartTableModule,
|
// Ng2SmartTableModule,
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
...routedComponents,
|
...routedComponents,
|
||||||
|
|
|
||||||
|
|
@ -2,15 +2,7 @@
|
||||||
"extends": "../tsconfig.json",
|
"extends": "../tsconfig.json",
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"outDir": "../out-tsc/app",
|
"outDir": "../out-tsc/app",
|
||||||
"baseUrl": "./",
|
"baseUrl": "./"
|
||||||
"paths": {
|
|
||||||
"@angular/*": [
|
|
||||||
"../node_modules/@angular/*"
|
|
||||||
],
|
|
||||||
"@nebular/*": [
|
|
||||||
"../node_modules/@nebular/*"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"exclude": [
|
"exclude": [
|
||||||
"test.ts",
|
"test.ts",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue