Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit fc31da2

Browse files
committed
Add maps pages
1 parent 7f6e51b commit fc31da2

File tree

5 files changed

+186
-597
lines changed

5 files changed

+186
-597
lines changed

‎package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
},
1111
"private": true,
1212
"dependencies": {
13-
"@agm/core": "^3.0.0-beta",
14-
"@amcharts/amcharts5": "^5.2.6",
15-
"@amcharts/amcharts5-fonts": "^5.0.1",
16-
"@amcharts/amcharts5-geodata": "^5.0.3",
13+
"@agm/core": "^1.1.0",
14+
1715
"@angular/animations": "^13.2.4",
1816
"@angular/cdk": "^13.2.4",
1917
"@angular/common": "~13.2.4",
@@ -49,13 +47,16 @@
4947
"zone.js": "~0.11.4"
5048
},
5149
"devDependencies": {
50+
"@amcharts/amcharts4": "^4.9.37",
51+
"@amcharts/amcharts4-geodata": "^4.1.17",
5252
"@angular-devkit/build-angular": "~13.2.5",
5353
"@angular/cli": "~13.2.5",
5454
"@angular/compiler-cli": "~13.2.4",
5555
"@angular/language-service": "~13.2.4",
5656
"@angularclass/hmr": "^3.0.0",
5757
"@types/jasmine": "~3.6.0",
5858
"@types/jasminewd2": "~2.0.8",
59+
"@types/echarts": "^4.6.7",
5960
"@types/node": "^12.12.64",
6061
"codelyzer": "^6.0.0",
6162
"ts-node": "~8.3.0",

‎src/app/app-routing.module.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ const route: Routes = [
6969
canActivate: [AuthGuard],
7070
loadChildren: () => import('./modules/templates/charts/charts.module').then(m => m.ChartsModule)
7171
},
72-
// {
73-
// path: 'maps',
74-
// canActivate: [AuthGuard],
75-
// loadChildren: () => import('./modules/templates/maps/maps.module').then(m => m.MapsModule)
76-
// },
72+
{
73+
path: 'maps',
74+
canActivate: [AuthGuard],
75+
loadChildren: () => import('./modules/templates/maps/maps.module').then(m => m.MapsModule)
76+
},
7777
// {
7878
// path: 'extra',
7979
// canActivate: [AuthGuard],

‎src/app/modules/templates/maps/map-routing.module.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { RouterModule, Routes } from '@angular/router';
22
import { NgModule } from '@angular/core';
3-
import { GoogleMapPageComponent, VectorMapPageComponent } from './components';
3+
import { GoogleMapPageComponent } from './components';
4+
import { VectorMapPageComponent } from './components';
45

56
const routes: Routes = [
67
{

‎src/app/modules/templates/maps/maps.module.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
3+
import { MatCardModule } from '@angular/material/card';
34
import { AgmCoreModule } from '@agm/core';
5+
46
import { googleMapKey } from './consts';
57
import { GoogleMapPageComponent } from './components';
68
import { SharedModule } from '../../../shared/shared.module';
7-
import { MatCardModule } from '@angular/material/card';
89
import { MapsRoutingModule } from './map-routing.module';
910
import { VectorMapPageComponent } from './components';
1011

1112
@NgModule({
1213
declarations: [
13-
// GoogleMapPageComponent,
14-
// VectorMapPageComponent
14+
GoogleMapPageComponent,
15+
VectorMapPageComponent
1516
],
1617
imports: [
1718
CommonModule,

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /