Merge branch 'develop' of https://github.com/fivethree-team/component…

…-library into develop

package.json

@@ -10,7 +10,7 @@
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "gh-pages": "ng build --base-href 'https://fivethree-team.github.io/fivethree/' && npx ngh --dir=www --dry-run"
+    "gh-pages": "ng build --base-href 'https://fivethree-team.github.io/fivethree/' && npx ngh --dir=www"
   },
   "private": true,
   "dependencies": {

src/app/map-web-native/map-web-native.page.html

@@ -8,5 +8,5 @@
 </ion-header>
 
 <ion-content>
-  <fiv-google-maps apiKey="YOUR_API_KEY" [isCordova]="isCordova"></fiv-google-maps>
+  <fiv-google-maps [apiKey]="apiKey" [isCordova]="isCordova"></fiv-google-maps>
 </ion-content>

src/app/map-web-native/map-web-native.page.ts

@@ -1,5 +1,6 @@
 import { Platform } from '@ionic/angular';
 import { Component, OnInit } from '@angular/core';
+import { environment } from '@environments/environment';
 
 @Component({
   selector: 'app-map-web-native',
@@ -8,6 +9,7 @@ import { Component, OnInit } from '@angular/core';
 })
 export class MapWebNativePage implements OnInit {
 
+  apiKey = environment.mapApiKey
   isCordova: boolean;
 
   constructor(private platform: Platform) { }

src/app/map/map.page.html

@@ -8,5 +8,5 @@
 </ion-header>
 
 <ion-content>
-  <fiv-google-map-web apiKey="YOUR_API_KEY"></fiv-google-map-web>
+  <fiv-google-map-web [apiKey]="apiKey"></fiv-google-map-web>
 </ion-content>

src/app/map/map.page.ts

@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { environment } from '@environments/environment';
 
 @Component({
   selector: 'app-map',
@@ -7,6 +8,8 @@ import { Component, OnInit } from '@angular/core';
 })
 export class MapPage implements OnInit {
 
+  apiKey = environment.mapApiKey;
+
   constructor() { }
 
   ngOnInit() {

src/environments/environment.prod.ts

@@ -1,3 +1,4 @@
 export const environment = {
-  production: true
+  production: true,
+  mapApiKey: 'YOUR_API_KEY'
 };

src/environments/environment.ts

@@ -3,7 +3,8 @@
 // `ng build --env=prod` then `environment.prod.ts` will be used instead.
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 export const environment = {
-  production: false
+  production: false,
+  mapApiKey: 'YOUR_API_KEY'
 };
 
 /*

tsconfig.json

@@ -14,17 +14,18 @@
       "dom"
     ],
     "paths": {
-      "ionic-material-loading": [
-        "dist/ionic-material-loading"
+      "@environments/*": ["src/environments/*"],
+      "loading": [
+        "dist/loading"
       ],
-      "ionic-material-loading/*": [
-        "dist/ionic-material-loading/*"
+      "loading/*": [
+        "dist/loading/*"
       ],
-      "ionic-material-dialog": [
-        "dist/ionic-material-dialog"
+      "dialog": [
+        "dist/dialog"
       ],
-      "ionic-material-dialog/*": [
-        "dist/ionic-material-dialog/*"
+      "dialog/*": [
+        "dist/dialog/*"
       ],
       "google-maps": [
         "dist/google-maps"