Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-19 08:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove packages uncompatible with Ivy

Browse source
This commit is contained in:
eugene-sinitsyn 2020-03-03 11:52:57 +03:00
parent 99e85ac0fe
commit d673c512ec
16 changed files with 62 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

5
package-lock.json generated
View file

@ -4,11 +4,6 @@
"lockfileVersion": 1,
"requires": true,
"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": {
"version": "0.900.4",
"resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.4.tgz",

3
package.json
View file

@ -30,7 +30,6 @@
"postinstall": "ngcc --properties es2015 es5 browser module main --first-only --create-ivy-entry-points"
},
"dependencies": {
"@agm/core": "^1.0.0-beta.5",
"@angular/animations": "^9.0.4",
"@angular/cdk": "^8.0.0",
"@angular/common": "^9.0.4",
@ -60,8 +59,6 @@
"leaflet": "1.2.0",
"nebular-icons": "1.1.0",
"ng2-ckeditor": "^1.2.2",
"ng2-completer": "3.0.3",
"ng2-smart-table": "1.5.0",
"ngx-echarts": "^4.2.2",
"node-sass": "^4.12.0",
"normalize.css": "6.0.0",

5
src/app/@core/core.module.ts
View file

@ -153,13 +153,16 @@ export const NB_CORE_PROVIDERS = [
NbAuthModule,
],
declarations: [],
providers: [
...NB_CORE_PROVIDERS
]
})
export class CoreModule {
constructor(@Optional() @SkipSelf() parentModule: CoreModule) {
throwIfAlreadyLoaded(parentModule, 'CoreModule');
}
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<CoreModule> {
return <ModuleWithProviders>{
ngModule: CoreModule,
providers: [

2
src/app/@core/mock/mock-data.module.ts
View file

@ -54,7 +54,7 @@ const SERVICES = [
],
})
export class MockDataModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<MockDataModule> {
return <ModuleWithProviders>{
ngModule: MockDataModule,
providers: [

10
src/app/@theme/theme.module.ts
View file

@ -74,9 +74,17 @@ const PIPES = [
imports: [CommonModule, ...NB_MODULES],
exports: [CommonModule, ...PIPES, ...COMPONENTS],
declarations: [...COMPONENTS, ...PIPES],
providers: [
...NbThemeModule.forRoot(
{
name: 'default',
},
[ DEFAULT_THEME, COSMIC_THEME, CORPORATE_THEME, DARK_THEME ],
).providers,
]
})
export class ThemeModule {
static forRoot(): ModuleWithProviders {
static forRoot(): ModuleWithProviders<ThemeModule> {
return <ModuleWithProviders>{
ngModule: ThemeModule,
providers: [

4
src/app/app-routing.module.ts
View file

@ -9,10 +9,10 @@ import {
NbResetPasswordComponent,
} from '@nebular/auth';
const routes: Routes = [
export const routes: Routes = [
{
path: 'pages',
loadChildren: () => import('app/pages/pages.module')
loadChildren: () => import('./pages/pages.module')
.then(m => m.PagesModule),
},
{

6
src/app/app.module.ts
View file

@ -28,9 +28,6 @@ import {
BrowserAnimationsModule,
HttpClientModule,
AppRoutingModule,
ThemeModule.forRoot(),
NbSidebarModule.forRoot(),
NbMenuModule.forRoot(),
NbDatepickerModule.forRoot(),
@ -40,7 +37,8 @@ import {
NbChatModule.forRoot({
messageGoogleMapKey: 'AIzaSyA_wNuCzia92MAmdLRzmqitRGvCF7wCZPY',
}),
CoreModule.forRoot(),
CoreModule,
ThemeModule,
],
bootstrap: [AppComponent],
})

4
src/app/pages/maps/gmaps/gmaps.component.ts
View file

@ -7,9 +7,9 @@ import { Component } from '@angular/core';
<nb-card>
<nb-card-header>Google Maps</nb-card-header>
<nb-card-body>
<agm-map [latitude]="lat" [longitude]="lng">
<!-- <agm-map [latitude]="lat" [longitude]="lng">
<agm-marker [latitude]="lat" [longitude]="lng"></agm-marker>
</agm-map>
</agm-map> -->
</nb-card-body>
</nb-card>
`,

10
src/app/pages/maps/maps.module.ts
View file

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { AgmCoreModule } from '@agm/core';
// import { AgmCoreModule } from '@agm/core';
import { LeafletModule } from '@asymmetrik/ngx-leaflet';
import { NgxEchartsModule } from 'ngx-echarts';
import { NbCardModule } from '@nebular/theme';
@ -10,10 +10,10 @@ import { MapsRoutingModule, routedComponents } from './maps-routing.module';
@NgModule({
imports: [
ThemeModule,
AgmCoreModule.forRoot({
apiKey: 'AIzaSyCpVhQiwAllg1RAFaxMWSpQruuGARy0Y1k',
libraries: ['places'],
}),
// AgmCoreModule.forRoot({
// apiKey: 'AIzaSyCpVhQiwAllg1RAFaxMWSpQruuGARy0Y1k',
// libraries: ['places'],
// }),
LeafletModule.forRoot(),
MapsRoutingModule,
NgxEchartsModule,

4
src/app/pages/maps/search-map/map/map.component.html
View file

@ -1,7 +1,7 @@
<agm-map [latitude]="latitude"
<!-- <agm-map [latitude]="latitude"
[longitude]="longitude"
[scrollwheel]="false"
[zoom]="zoom">
<agm-marker [latitude]="latitude"
[longitude]="longitude"></agm-marker>
</agm-map>
</agm-map> -->

40
src/app/pages/maps/search-map/search/search.component.ts
View file

@ -1,5 +1,5 @@
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';
@ -14,31 +14,31 @@ export class SearchComponent implements OnInit {
@ViewChild('search', { static: true })
public searchElementRef: ElementRef;
constructor(private mapsAPILoader: MapsAPILoader,
constructor(// private mapsAPILoader: MapsAPILoader,
private ngZone: NgZone) {
}
ngOnInit() {
// load Places Autocomplete
this.mapsAPILoader.load().then(() => {
const autocomplete = new google.maps.places.Autocomplete(this.searchElementRef.nativeElement, {
types: ['address'],
});
autocomplete.addListener('place_changed', () => {
this.ngZone.run(() => {
// get the place result
const place: google.maps.places.PlaceResult = autocomplete.getPlace();
// this.mapsAPILoader.load().then(() => {
// const autocomplete = new google.maps.places.Autocomplete(this.searchElementRef.nativeElement, {
// types: ['address'],
// });
// autocomplete.addListener('place_changed', () => {
// this.ngZone.run(() => {
// // get the place result
// const place: google.maps.places.PlaceResult = autocomplete.getPlace();
// verify result
if (place.geometry === undefined || place.geometry === null) {
return;
}
// // verify result
// if (place.geometry === undefined || place.geometry === null) {
// return;
// }
this.positionChanged.emit(
new Location(place.geometry.location.lat(),
place.geometry.location.lng()));
});
});
});
// this.positionChanged.emit(
// new Location(place.geometry.location.lat(),
// place.geometry.location.lng()));
// });
// });
// });
}
}

4
src/app/pages/tables/smart-table/smart-table.component.html
View file

@ -4,7 +4,7 @@
</nb-card-header>
<nb-card-body>
<ng2-smart-table [settings]="settings" [source]="source" (deleteConfirm)="onDeleteConfirm($event)">
</ng2-smart-table>
<!-- <ng2-smart-table [settings]="settings" [source]="source" (deleteConfirm)="onDeleteConfirm($event)">
</ng2-smart-table> -->
</nb-card-body>
</nb-card>

8
src/app/pages/tables/smart-table/smart-table.component.ts
View file

@ -1,5 +1,5 @@
import { Component } from '@angular/core';
import { LocalDataSource } from 'ng2-smart-table';
// import { LocalDataSource } from 'ng2-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) {
const data = this.service.getData();
this.source.load(data);
// const data = this.service.getData();
// this.source.load(data);
}
onDeleteConfirm(event): void {

12
src/app/pages/tables/tables-routing.module.ts
View file

@ -2,17 +2,17 @@ import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
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';
const routes: Routes = [{
path: '',
component: TablesComponent,
children: [
{
path: 'smart-table',
component: SmartTableComponent,
},
// {
// path: 'smart-table',
// component: SmartTableComponent,
// },
{
path: 'tree-grid',
component: TreeGridComponent,
@ -28,6 +28,6 @@ export class TablesRoutingModule { }
export const routedComponents = [
TablesComponent,
SmartTableComponent,
// SmartTableComponent,
TreeGridComponent,
];

4
src/app/pages/tables/tables.module.ts
View file

@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
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 { TablesRoutingModule, routedComponents } from './tables-routing.module';
@ -14,7 +14,7 @@ import { FsIconComponent } from './tree-grid/tree-grid.component';
NbInputModule,
ThemeModule,
TablesRoutingModule,
Ng2SmartTableModule,
// Ng2SmartTableModule,
],
declarations: [
...routedComponents,

10
src/tsconfig.app.json
View file

@ -2,15 +2,7 @@
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"baseUrl": "./",
"paths": {
"@angular/*": [
"../node_modules/@angular/*"
],
"@nebular/*": [
"../node_modules/@nebular/*"
]
}
"baseUrl": "./"
},
"exclude": [
"test.ts",