From 67bb904770897970d2ed27651230b6993d3d46a4 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Tue, 26 Sep 2017 16:22:54 +0100 Subject: [PATCH 01/15] Package added & npm updated --- package-lock.json | 9 +++++++-- package.json | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2c53884..b3325ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,9 +1,14 @@ { - "name": "coreui-angular", - "version": "1.0.0-alpha.5", + "name": "localloop-web", + "version": "0.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { + "@agm/core": { + "version": "1.0.0-beta.1", + "resolved": "https://registry.npmjs.org/@agm/core/-/core-1.0.0-beta.1.tgz", + "integrity": "sha512-IVwQGmcaE42SmYY2e5QwqOC0vrSXZCW8BhATY0Vpy3NjbiydSXi9T81hVqKLvuKaB3ves1sv3W++SB1Wj+5B6A==" + }, "@angular-devkit/build-optimizer": { "version": "0.0.13", "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.13.tgz", diff --git a/package.json b/package.json index 9c56d35..1fd8e65 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ }, "private": true, "dependencies": { + "@agm/core": "^1.0.0-beta.1", "@angular/common": "4.0.3", "@angular/compiler": "4.0.3", "@angular/core": "4.0.3", From 40bd7459b5e5c683eaea3e3a7792c2746cf387ed Mon Sep 17 00:00:00 2001 From: piratefinn Date: Tue, 26 Sep 2017 17:31:40 +0100 Subject: [PATCH 02/15] Map page added with map --- src/app/dashboard/dashboard.module.ts | 9 ++++++++ src/app/dashboard/dashboard.routing.ts | 7 +++++++ src/app/dashboard/map.component.html | 19 +++++++++++++++++ src/app/dashboard/map.component.ts | 24 ++++++++++++++++++++++ src/app/layouts/full-layout.component.html | 5 +++++ src/scss/_custom.scss | 6 ++++++ 6 files changed, 70 insertions(+) create mode 100644 src/app/dashboard/map.component.html create mode 100644 src/app/dashboard/map.component.ts diff --git a/src/app/dashboard/dashboard.module.ts b/src/app/dashboard/dashboard.module.ts index 134d8bd..f584ef4 100644 --- a/src/app/dashboard/dashboard.module.ts +++ b/src/app/dashboard/dashboard.module.ts @@ -4,6 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ChartsModule } from 'ng2-charts/ng2-charts'; import { BsDropdownModule } from 'ngx-bootstrap/dropdown'; import { NgxPaginationModule } from 'ngx-pagination'; +import { AgmCoreModule } from '@agm/core'; import { CurrencyPipe } from '@angular/common'; @@ -14,6 +15,7 @@ import { AddDataComponent } from './add-data.component'; import { FeedbackComponent } from './feedback.component'; import { TransactionLogComponent } from './transaction-log.component'; import { PayrollLogComponent } from './payroll-log.component'; +import { MapComponent } from './map.component'; import { GraphWidget } from '../widgets/graph-widget.component'; import { OrgBarSnippetComponent } from '../snippets/org-snippet-bar.component'; @@ -25,6 +27,9 @@ import { OrgTableComponent } from '../shared/org-table.component'; import { TransactionResultComponent } from '../shared/transaction-result.component'; import { PayrollResultComponent } from '../shared/payroll-result.component'; +// API key env variable import +import { environment } from '../../environments/environment'; + @NgModule({ imports: [ // Angular imports @@ -32,6 +37,9 @@ import { PayrollResultComponent } from '../shared/payroll-result.component'; FormsModule, ReactiveFormsModule, ChartsModule, + AgmCoreModule.forRoot({ + apiKey: environment.mapApiKey + }), BsDropdownModule, NgxPaginationModule, DashboardRoutingModule, @@ -47,6 +55,7 @@ import { PayrollResultComponent } from '../shared/payroll-result.component'; TransactionResultComponent, PayrollLogComponent, PayrollResultComponent, + MapComponent, FeedbackComponent, GraphWidget, OrgBarSnippetComponent, diff --git a/src/app/dashboard/dashboard.routing.ts b/src/app/dashboard/dashboard.routing.ts index c36cfb2..f28c65e 100644 --- a/src/app/dashboard/dashboard.routing.ts +++ b/src/app/dashboard/dashboard.routing.ts @@ -13,6 +13,7 @@ import { AddDataComponent } from './add-data.component'; import { FeedbackComponent } from './feedback.component'; import { TransactionLogComponent } from './transaction-log.component'; import { PayrollLogComponent } from './payroll-log.component'; +import { MapComponent } from './map.component'; // Using child path to allow for FullLayout theming const routes: Routes = [ @@ -49,6 +50,12 @@ const routes: Routes = [ component: TransactionLogComponent, data: { title: 'Transaction Log' }, }, + { + path: 'map', + component: MapComponent, + data: { title: 'Supplier Map' }, + canActivate: [OrgGuard], + }, { path: 'payroll-log', component: PayrollLogComponent, diff --git a/src/app/dashboard/map.component.html b/src/app/dashboard/map.component.html new file mode 100644 index 0000000..27ce4c7 --- /dev/null +++ b/src/app/dashboard/map.component.html @@ -0,0 +1,19 @@ +
+
+
+
+
+ Supplier Map + Required Data marked in bold. +
+
+ + + + + +
+
+
+
+
diff --git a/src/app/dashboard/map.component.ts b/src/app/dashboard/map.component.ts new file mode 100644 index 0000000..233ad94 --- /dev/null +++ b/src/app/dashboard/map.component.ts @@ -0,0 +1,24 @@ +import { Component, OnInit } from '@angular/core'; +import { Http, Response } from '@angular/http'; +import { ApiService } from '../providers/api-service'; +import { AgmCoreModule } from '@agm/core'; +import 'rxjs/add/operator/map'; + +@Component({ + templateUrl: 'map.component.html', +}) +export class MapComponent implements OnInit { + + lat: number = 54.0466; + lng: number = 2.8007; + + constructor( + private http: Http, + private api: ApiService, + ) { } + + ngOnInit(): void { + + } + +} diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 17f0b57..f92357c 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -40,6 +40,11 @@ Enter Feedback +
  • + + Supplier Map + +
  • Transaction Log diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index 08dacc5..a47ee9f 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -14,6 +14,12 @@ background-color: #0f81a8; color: #e8ebed; } + +// Map styling +agm-map { + height: 300px; +} + // white title font variant on type-2 as defined in _widgets.css .horizontal-bars { padding: 0; From 5d3283171c9a499dc28924b30f0c50b93e3b014d Mon Sep 17 00:00:00 2001 From: piratefinn Date: Tue, 26 Sep 2017 17:51:14 +0100 Subject: [PATCH 03/15] styling improved --- src/app/dashboard/map.component.html | 2 -- src/app/dashboard/map.component.ts | 2 +- src/scss/_custom.scss | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/dashboard/map.component.html b/src/app/dashboard/map.component.html index 27ce4c7..e7de04f 100644 --- a/src/app/dashboard/map.component.html +++ b/src/app/dashboard/map.component.html @@ -6,13 +6,11 @@ Supplier Map Required Data marked in bold. -
    -
    diff --git a/src/app/dashboard/map.component.ts b/src/app/dashboard/map.component.ts index 233ad94..1a05488 100644 --- a/src/app/dashboard/map.component.ts +++ b/src/app/dashboard/map.component.ts @@ -10,7 +10,7 @@ import 'rxjs/add/operator/map'; export class MapComponent implements OnInit { lat: number = 54.0466; - lng: number = 2.8007; + lng: number = -2.8007; constructor( private http: Http, diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index a47ee9f..f3e9c04 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -17,7 +17,7 @@ // Map styling agm-map { - height: 300px; + height: 75vh; } // white title font variant on type-2 as defined in _widgets.css From 64e028f0c51ec7d7675ff411983a0f6af9c4f979 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 27 Sep 2017 12:02:46 +0100 Subject: [PATCH 04/15] Added default zoom --- src/app/dashboard/map.component.html | 2 +- src/app/dashboard/map.component.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/dashboard/map.component.html b/src/app/dashboard/map.component.html index e7de04f..8626466 100644 --- a/src/app/dashboard/map.component.html +++ b/src/app/dashboard/map.component.html @@ -8,7 +8,7 @@ - + diff --git a/src/app/dashboard/map.component.ts b/src/app/dashboard/map.component.ts index 1a05488..e39e853 100644 --- a/src/app/dashboard/map.component.ts +++ b/src/app/dashboard/map.component.ts @@ -11,6 +11,7 @@ export class MapComponent implements OnInit { lat: number = 54.0466; lng: number = -2.8007; + zoom: number = 12; constructor( private http: Http, From 1eb79aa0474398fdb5bd75ff2a0e2ac4c67f3f16 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 27 Sep 2017 13:54:10 +0100 Subject: [PATCH 05/15] Added API and fixes --- src/app/dashboard/dashboard.module.ts | 5 ++-- src/app/dashboard/map.component.html | 25 ++++++++++++++---- src/app/dashboard/map.component.ts | 38 +++++++++++++++++++++++++-- src/app/providers/api-service.ts | 9 +++++++ 4 files changed, 68 insertions(+), 9 deletions(-) diff --git a/src/app/dashboard/dashboard.module.ts b/src/app/dashboard/dashboard.module.ts index f584ef4..a8c59b0 100644 --- a/src/app/dashboard/dashboard.module.ts +++ b/src/app/dashboard/dashboard.module.ts @@ -4,7 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ChartsModule } from 'ng2-charts/ng2-charts'; import { BsDropdownModule } from 'ngx-bootstrap/dropdown'; import { NgxPaginationModule } from 'ngx-pagination'; -import { AgmCoreModule } from '@agm/core'; +import { AgmCoreModule, GoogleMapsAPIWrapper } from '@agm/core'; import { CurrencyPipe } from '@angular/common'; @@ -62,7 +62,8 @@ import { environment } from '../../environments/environment'; GraphPanel, ], providers: [ - CurrencyPipe + CurrencyPipe, + GoogleMapsAPIWrapper, ], }) export class DashboardModule { } diff --git a/src/app/dashboard/map.component.html b/src/app/dashboard/map.component.html index 8626466..646009f 100644 --- a/src/app/dashboard/map.component.html +++ b/src/app/dashboard/map.component.html @@ -6,11 +6,26 @@ Supplier Map Required Data marked in bold. - - - - - +
    +
    + +
    +
    + + + + + +
    +
    diff --git a/src/app/dashboard/map.component.ts b/src/app/dashboard/map.component.ts index e39e853..71b7274 100644 --- a/src/app/dashboard/map.component.ts +++ b/src/app/dashboard/map.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { Http, Response } from '@angular/http'; import { ApiService } from '../providers/api-service'; import { AgmCoreModule } from '@agm/core'; @@ -13,13 +13,47 @@ export class MapComponent implements OnInit { lng: number = -2.8007; zoom: number = 12; + dataReceived: string = 'yes'; + + map: any; + constructor( private http: Http, private api: ApiService, ) { } - ngOnInit(): void { + ngOnInit(): void { } + public onMapReady(map: any) { + this.map = map; } + public viewBoundsChanged() { + console.log("finding bounds"); + const resp = this.map.getBounds(); + console.log("found bounds"); + console.log(resp.getNorthEast().lat()); + console.log(resp.getNorthEast().lng()); + console.log(resp.getSouthWest().lat()); + console.log(resp.getSouthWest().lng()); + const mapData = { + north_east_lat: resp.getNorthEast().lat(), + north_east_lng: resp.getNorthEast().lng(), + south_west_lat: resp.getSouthWest().lat(), + south_west_lng: resp.getSouthWest().lng() + }; + this.api.getMapData(mapData).subscribe( + result => { + this.dataReceived = 'yes'; + }, + error => { + // this.dataReceived = 'no'; + console.log('Retrieval Error'); + console.log( error._body ); + } + ); + } + + + } diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts index 6c6ea47..4bc910d 100644 --- a/src/app/providers/api-service.ts +++ b/src/app/providers/api-service.ts @@ -264,6 +264,15 @@ export class ApiService { ).map( response => response.json() ); } + // Initial Map Data + public getMapData(data) { + data.session_key = this.sessionKey; + return this.http.post( + this.apiUrl + '/map', + data + ).map( response => response.json() ); + } + // Basic Customer User stats API public basicStats() { const key = this.sessionKey; From b59351addf2e51b88b66bda84744f77ec08f50ef Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 27 Sep 2017 14:34:46 +0100 Subject: [PATCH 06/15] made looping markers --- src/app/dashboard/map.component.html | 11 ++++++++++- src/app/dashboard/map.component.ts | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/app/dashboard/map.component.html b/src/app/dashboard/map.component.html index 646009f..04d7d73 100644 --- a/src/app/dashboard/map.component.html +++ b/src/app/dashboard/map.component.html @@ -22,7 +22,16 @@ [zoom]="zoom" [scaleControl]="true" (idle)="viewBoundsChanged($event)"> - + + + + {{m.label}} + +     diff --git a/src/app/dashboard/map.component.ts b/src/app/dashboard/map.component.ts index 71b7274..5acc512 100644 --- a/src/app/dashboard/map.component.ts +++ b/src/app/dashboard/map.component.ts @@ -15,6 +15,25 @@ export class MapComponent implements OnInit { dataReceived: string = 'yes'; + markers = [ + { + lat: 54.0466, + lng: -2.8007, + label: 'A', + + }, + { + lat: 54.0453, + lng: -2.83, + label: 'B' + }, + { + lat: 54.0563, + lng: -2.8279, + label: 'C' + } + ] + map: any; constructor( From f402d46db8d3e924ce6e25c281957b19eb1c3e04 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 27 Sep 2017 17:46:25 +0100 Subject: [PATCH 07/15] Added API changes --- src/app/dashboard/map.component.html | 8 +++---- src/app/dashboard/map.component.ts | 34 +++++++++------------------- src/app/providers/api-service.ts | 2 +- 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/src/app/dashboard/map.component.html b/src/app/dashboard/map.component.html index 04d7d73..1c408a4 100644 --- a/src/app/dashboard/map.component.html +++ b/src/app/dashboard/map.component.html @@ -24,12 +24,12 @@ (idle)="viewBoundsChanged($event)"> + [latitude]="m.latitude" + [longitude]="m.longitude" + [label]="m.name[0]"> - {{m.label}} + {{m.name}} diff --git a/src/app/dashboard/map.component.ts b/src/app/dashboard/map.component.ts index 5acc512..71faed0 100644 --- a/src/app/dashboard/map.component.ts +++ b/src/app/dashboard/map.component.ts @@ -15,24 +15,7 @@ export class MapComponent implements OnInit { dataReceived: string = 'yes'; - markers = [ - { - lat: 54.0466, - lng: -2.8007, - label: 'A', - - }, - { - lat: 54.0453, - lng: -2.83, - label: 'B' - }, - { - lat: 54.0563, - lng: -2.8279, - label: 'C' - } - ] + markers: Array<{latitude: number, longitude: number, name: string}>; map: any; @@ -56,14 +39,19 @@ export class MapComponent implements OnInit { console.log(resp.getSouthWest().lat()); console.log(resp.getSouthWest().lng()); const mapData = { - north_east_lat: resp.getNorthEast().lat(), - north_east_lng: resp.getNorthEast().lng(), - south_west_lat: resp.getSouthWest().lat(), - south_west_lng: resp.getSouthWest().lng() - }; + north_east: { + latitude: resp.getNorthEast().lat(), + longitude: resp.getNorthEast().lng() + }, + south_west: { + latitude: resp.getSouthWest().lat(), + longitude: resp.getSouthWest().lng() + }, + } this.api.getMapData(mapData).subscribe( result => { this.dataReceived = 'yes'; + this.markers = result.suppliers; }, error => { // this.dataReceived = 'no'; diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts index 4bc910d..37919e3 100644 --- a/src/app/providers/api-service.ts +++ b/src/app/providers/api-service.ts @@ -268,7 +268,7 @@ export class ApiService { public getMapData(data) { data.session_key = this.sessionKey; return this.http.post( - this.apiUrl + '/map', + this.apiUrl + '/v1/suppliers/location', data ).map( response => response.json() ); } From a622b0d87141f91903f934f7bcdef5d6a1570de1 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 12:47:09 +0100 Subject: [PATCH 08/15] Fix issue with supplier location api url --- src/app/providers/api-service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts index 37919e3..378035b 100644 --- a/src/app/providers/api-service.ts +++ b/src/app/providers/api-service.ts @@ -268,7 +268,7 @@ export class ApiService { public getMapData(data) { data.session_key = this.sessionKey; return this.http.post( - this.apiUrl + '/v1/suppliers/location', + this.apiUrl + '/v1/supplier/location', data ).map( response => response.json() ); } From 2ffe32c6f58a1f933ddc13b851562dcd4d8045f7 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 12:55:48 +0100 Subject: [PATCH 09/15] Change to a map icon for the Supplier Map --- src/app/layouts/full-layout.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index f92357c..4fc7f4c 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -42,7 +42,7 @@
  • - Supplier Map + Supplier Map
  • From d8b92af1a313a77eaf7b2c81bd48c5bec15fa183 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 13:12:34 +0100 Subject: [PATCH 10/15] Ignore prod and dev env settings --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f82ac9f..1f49108 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,8 @@ testem.log # local env variable /src/environments/environment.local.ts +/src/environments/environment.prod.ts +/src/environments/environment.dev.ts # ========================= # Operating System Files From 1eb8d71b4a73e9435caf5c09c56f415bb3e0fc8d Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 13:21:28 +0100 Subject: [PATCH 11/15] Removed prod environment file from repo --- src/environments/environment.prod.ts | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 src/environments/environment.prod.ts diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts deleted file mode 100644 index 49d8dc6..0000000 --- a/src/environments/environment.prod.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const environment = { - production: true, - apiUrl: 'https://app.peartrade.org/api' -}; From 8520328582805c2c0dae2dd096db9e34b2e8af80 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 13:25:19 +0100 Subject: [PATCH 12/15] Changed path of dev environment --- .angular-cli.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.angular-cli.json b/.angular-cli.json index 1290020..e7f0ed1 100644 --- a/.angular-cli.json +++ b/.angular-cli.json @@ -24,7 +24,7 @@ ], "environmentSource": "environments/environment.ts", "environments": { - "dev": "environments/environment.ts", + "dev": "environments/environment.dev.ts", "prod": "environments/environment.prod.ts", "local": "environments/environment.local.ts" } From ed738b287af7622c6396f8358ad79006195cf08b Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 13:28:57 +0100 Subject: [PATCH 13/15] Added placeholder for mapApiKey --- src/environments/environment.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/environments/environment.ts b/src/environments/environment.ts index bd894d3..725706a 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -5,5 +5,6 @@ export const environment = { production: false, - apiUrl: 'https://dev.peartrade.org/api' + apiUrl: 'https://dev.peartrade.org/api', + mapApiKey: 'CHANGEME', }; From cea000b90c8ca9fd3a19729f77dad121fb66fafe Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 14:12:25 +0100 Subject: [PATCH 14/15] Added ci specific e2e and test scripts --- .gitignore | 1 + .travis.yml | 2 ++ package.json | 5 +++-- src/environments/environment.ci.ts.enc | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 src/environments/environment.ci.ts.enc diff --git a/.gitignore b/.gitignore index 1f49108..67d6c52 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ testem.log /src/environments/environment.local.ts /src/environments/environment.prod.ts /src/environments/environment.dev.ts +/src/environments/environment.ci.ts # ========================= # Operating System Files diff --git a/.travis.yml b/.travis.yml index f262434..22ae810 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ addons: language: node_js node_js: - 8 +before_install: + - openssl aes-256-cbc -K $encrypted_9d2af3734b6c_key -iv $encrypted_9d2af3734b6c_iv -in src/environments/environment.ci.ts.enc -out src/environments/environment.ci.ts -d before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start diff --git a/package.json b/package.json index 1fd8e65..a6bcc31 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,11 @@ "start": "ng serve", "build": "ng build", "test": "ng test", - "test:once": "ng test --watch=false", + "test:ci": "ng test --watch=false --env=ci", "lint": "ng lint", "e2e": "ng e2e", - "ci": "npm run test:once && npm run e2e" + "e2e:ci": "ng e2e --env=ci", + "ci": "npm run test:ci && npm run e2e:ci" }, "private": true, "dependencies": { diff --git a/src/environments/environment.ci.ts.enc b/src/environments/environment.ci.ts.enc new file mode 100644 index 0000000..d7f9745 --- /dev/null +++ b/src/environments/environment.ci.ts.enc @@ -0,0 +1,2 @@ +gԟ^ f^ՍjAF$Qh0L+lD)9; +@&;q蠩 iE0#ҡŎbK7U%x_x/6m=P ?qFA$|'A製b1Ռ2~/,dL”P>S L \ No newline at end of file From 0cd7cdc96c83ac023a8bb1699ac726fe31f5c989 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 14:15:51 +0100 Subject: [PATCH 15/15] Added CI environment to angular cli file --- .angular-cli.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.angular-cli.json b/.angular-cli.json index e7f0ed1..f7b4f9c 100644 --- a/.angular-cli.json +++ b/.angular-cli.json @@ -26,7 +26,8 @@ "environments": { "dev": "environments/environment.dev.ts", "prod": "environments/environment.prod.ts", - "local": "environments/environment.local.ts" + "local": "environments/environment.local.ts", + "ci": "environments/environment.ci.ts" } } ],