Merge remote-tracking branch 'origin/theslby/pushapi' into theslby/pushapi

This commit is contained in:
Unknown 2018-03-13 16:37:03 +00:00
commit dc1e740889
2 changed files with 92 additions and 270 deletions

354
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -4,11 +4,7 @@
// The list of which env maps to which file can be found in `angular-cli.json`. // The list of which env maps to which file can be found in `angular-cli.json`.
export const environment = { export const environment = {
production: true, production: false,
apiUrl: 'https://dev.peartrade.org/api', apiUrl: 'https://dev.peartrade.org/api',
mapApiKey: 'AIzaSyBhm0iaIGG0Ko5IsfZx-CpLt01YHkp4Y1w', mapApiKey: 'CHANGEME',
config: {
"API_URL": "https://pwa-workshop-api.herokuapp.com",
"VAPID_PUBLIC_KEY": "BMDZ6FANqsYRF9iGo3Ki0LdltGZZksgIFbgxBr_otO0H7jTFgcm3v2bGSgnVGJ5bidvLvuKStirfDNl4khVBiok"
}
}; };