Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#23 Add Google maps #27

Merged
merged 3 commits into from
Dec 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,7 @@ testem.log
# System Files
.DS_Store
Thumbs.db

# Environment
/src/environments/environment.ts
/src/environments/environment.prod.ts
14 changes: 14 additions & 0 deletions src/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@angular/compiler": "~11.0.1",
"@angular/core": "~11.0.1",
"@angular/forms": "~11.0.1",
"@angular/google-maps": "^11.0.3",
"@angular/platform-browser": "~11.0.1",
"@angular/platform-browser-dynamic": "~11.0.1",
"@angular/router": "~11.0.1",
Expand Down
11 changes: 10 additions & 1 deletion src/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';

const routes: Routes = [];
const routes: Routes = [
{
path: '',
pathMatch: 'full',
loadChildren: () =>
import('./main/main.lazy-loaded.module').then(
(m) => m.MainLazyLoadedModule
),
},
];

@NgModule({
imports: [RouterModule.forRoot(routes)],
Expand Down
5 changes: 1 addition & 4 deletions src/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
</header>

<main>
<app-main>main</app-main>
<app-date-slider
(onSliderChange)="outputSliderRange($event)"
></app-date-slider>
<router-outlet></router-outlet>
</main>

<aside class="sidebar">
Expand Down
6 changes: 0 additions & 6 deletions src/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Component } from '@angular/core'
import { ISlider } from './date-slider/slider'

@Component({
selector: 'app-root',
Expand All @@ -8,9 +7,4 @@ import { ISlider } from './date-slider/slider'
})
export class AppComponent {
title = 'City-past';

outputSliderRange (range: ISlider): void {
const datesRange = `Start: ${range.startDate.getFullYear()} End: ${range.endDate.getFullYear()}`
console.log(datesRange)
}
}
13 changes: 7 additions & 6 deletions src/src/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
import { AppComponent } from './app.component'
import { AppRoutingModule } from './app-routing.module'
import { BrowserModule } from '@angular/platform-browser'
import { DateSliderComponent } from './date-slider/date-slider.component'
import { NgModule } from '@angular/core'
import { NgxSliderModule } from '@angular-slider/ngx-slider'
import { HeaderPanelComponent } from './header-panel/header-panel.component'
import { FooterComponent } from './footer/footer.component'
import { MainComponent } from './main/main.component'
import { RightSidebarComponent } from './right-sidebar/right-sidebar.component'
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'

import { environment } from '../environments/environment';
import { MapsModule } from './main/maps.module';
import { GoogleMapConfig } from './main/models/google-map-config';

@NgModule({
declarations: [
AppComponent,
HeaderPanelComponent,
FooterComponent,
MainComponent,
RightSidebarComponent,
DateSliderComponent
],
imports: [
BrowserModule,
AppRoutingModule,
BrowserAnimationsModule,
NgxSliderModule
MapsModule.forRoot(<GoogleMapConfig>{
googleMapApiKey: environment.googleMapApiKey,
}),
],
providers: [],
bootstrap: [AppComponent]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
:host {
display: contents;
}

.map {
display: contents;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<ng-container *ngIf="loaded$ | async">
<google-map class="map" height="100%" width="100%"></google-map>
</ng-container>
35 changes: 35 additions & 0 deletions src/src/app/main/components/google-map/google-map.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import {
ChangeDetectionStrategy,
Component,
Inject,
OnInit,
} from '@angular/core';
import { of } from 'rxjs';

import { GoogleMapConfig } from '../../models/google-map-config';
import { GoogleMapConfigService } from '../../services/google-map-config.service';
import { GoogleMapScriptLoaderService } from '../../services/google-map-script-loader.service';

@Component({
changeDetection: ChangeDetectionStrategy.OnPush,
selector: 'app-google-map',
templateUrl: './google-map.component.html',
styleUrls: ['./google-map.component.css'],
})
export class GoogleMapComponent implements OnInit {
loaded$ = of(false);

constructor(
@Inject(GoogleMapConfigService)
private readonly _config: GoogleMapConfig,
private readonly _loader: GoogleMapScriptLoaderService
) {}

ngOnInit() {
const url =
'https://maps.googleapis.com/maps/api/js' +
`?key=${this._config.googleMapApiKey}`;

this.loaded$ = this._loader.loadScript(url);
}
}
9 changes: 9 additions & 0 deletions src/src/app/main/main.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
:host {
display: contents;
}

.content {
display: flex;
flex-direction: column;
height: 100%;
}
10 changes: 9 additions & 1 deletion src/src/app/main/main.component.html
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
<p>main works!</p>
<div class="content">
<p>main works!</p>

<app-google-map></app-google-map>

<app-date-slider
(onSliderChange)="outputSliderRange($event)"
></app-date-slider>
</div>
8 changes: 7 additions & 1 deletion src/src/app/main/main.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import { ChangeDetectionStrategy, Component } from '@angular/core';

import { ISlider } from '../date-slider/slider';

@Component({
selector: 'app-main',
templateUrl: './main.component.html',
styleUrls: ['./main.component.css'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class MainComponent {
}
outputSliderRange(range: ISlider): void {
const datesRange = `Start: ${range.startDate.getFullYear()} End: ${range.endDate.getFullYear()}`;
console.log(datesRange);
}
}
23 changes: 23 additions & 0 deletions src/src/app/main/main.lazy-loaded.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { NgxSliderModule } from '@angular-slider/ngx-slider';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { GoogleMapsModule } from '@angular/google-maps';
import { RouterModule } from '@angular/router';

import { DateSliderComponent } from '../date-slider/date-slider.component';
import { GoogleMapComponent } from './components/google-map/google-map.component';
import { MainComponent } from './main.component';
import { routes } from './main.routes';
import { MapsModule } from './maps.module';

@NgModule({
declarations: [MainComponent, DateSliderComponent, GoogleMapComponent],
imports: [
CommonModule,
GoogleMapsModule,
RouterModule.forChild(routes),
NgxSliderModule,
MapsModule,
],
})
export class MainLazyLoadedModule {}
10 changes: 10 additions & 0 deletions src/src/app/main/main.routes.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { Routes } from '@angular/router';

import { MainComponent } from './main.component';

export const routes: Routes = [
{
path: '',
component: MainComponent,
},
];
23 changes: 23 additions & 0 deletions src/src/app/main/maps.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { CommonModule } from '@angular/common';
import { HttpClientJsonpModule, HttpClientModule } from '@angular/common/http';
import { ModuleWithProviders, NgModule } from '@angular/core';

import { GoogleMapConfig } from './models/google-map-config';
import { GoogleMapConfigService } from './services/google-map-config.service';

@NgModule({
imports: [CommonModule, HttpClientModule, HttpClientJsonpModule],
})
export class MapsModule {
static forRoot(config: GoogleMapConfig): ModuleWithProviders<MapsModule> {
return {
ngModule: MapsModule,
providers: [
{
provide: GoogleMapConfigService,
useValue: config,
},
],
};
}
}
3 changes: 3 additions & 0 deletions src/src/app/main/models/google-map-config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export interface GoogleMapConfig {
googleMapApiKey: string;
}
7 changes: 7 additions & 0 deletions src/src/app/main/services/google-map-config.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { InjectionToken } from '@angular/core';

import { GoogleMapConfig } from '../models/google-map-config';

export const GoogleMapConfigService = new InjectionToken<GoogleMapConfig>(
'GoogleMapConfig'
);
18 changes: 18 additions & 0 deletions src/src/app/main/services/google-map-script-loader.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable, of } from 'rxjs';
import { catchError, map } from 'rxjs/operators';

@Injectable({
providedIn: 'root',
})
export class GoogleMapScriptLoaderService {
constructor(private readonly _httpClient: HttpClient) {}

loadScript(url: string): Observable<boolean> {
return this._httpClient.jsonp(url, 'callback').pipe(
map(() => true),
catchError(() => of(false))
);
}
}
3 changes: 0 additions & 3 deletions src/src/environments/environment.prod.ts

This file was deleted.

4 changes: 4 additions & 0 deletions src/src/environments/environment.sample.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export const environment = {
production: false,
googleMapApiKey: 'google-map-api-key', // Google Map API Key
};
16 changes: 0 additions & 16 deletions src/src/environments/environment.ts

This file was deleted.