From 0a9e80fc97076d9ecf40c80f56e6363acc9569ea Mon Sep 17 00:00:00 2001 From: piratefinn Date: Fri, 20 Oct 2017 13:21:49 +0100 Subject: [PATCH 01/18] Fixed transaction submission --- package-lock.json | 18 +++++++++--------- src/app/dashboard/add-data.component.html | 2 +- src/app/dashboard/add-data.component.ts | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index b3325ee..655bc51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "localloop-web", - "version": "0.0.1", + "version": "0.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -7979,14 +7979,6 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -7997,6 +7989,14 @@ "strip-ansi": "3.0.1" } }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html index 3a78b96..948f868 100644 --- a/src/app/dashboard/add-data.component.html +++ b/src/app/dashboard/add-data.component.html @@ -31,7 +31,7 @@ Enter the name of the organisation money was spent. Choose existing ones from below or if not found, enter the details below. - +
diff --git a/src/app/dashboard/add-data.component.ts b/src/app/dashboard/add-data.component.ts index 359c294..13589c7 100644 --- a/src/app/dashboard/add-data.component.ts +++ b/src/app/dashboard/add-data.component.ts @@ -32,7 +32,7 @@ export class AddDataComponent implements OnInit { organisationPostcode: string; amount: number; transactionAdditionType = 1; - storeList; + storeList = []; showAddStore = false; submitReceipt = false; transactionFormInvalid = true; @@ -108,7 +108,7 @@ export class AddDataComponent implements OnInit { } // handle the case when the storelist is empty if (this.storeList.length < 1) { - this.storeList = null; + this.storeList = []; this.showAddStore = true; this.transactionAdditionType = 3; } @@ -135,7 +135,7 @@ export class AddDataComponent implements OnInit { const val = ev.target.value; // Filter the store list so search seems quicker - if (val && val.trim() !== '' && this.storeList !== null) { + if (val && val.trim() !== '' && this.storeList.length > 0) { this.storeList = this.storeList.filter( (item) => { return ( item.name.toLowerCase().indexOf( val.toLowerCase() ) > -1 ); From 0a54cdc0918c642b01a95cb0237936f79d0e81ff Mon Sep 17 00:00:00 2001 From: piratefinn Date: Fri, 10 Nov 2017 14:13:28 +0000 Subject: [PATCH 02/18] fixed register name in place --- src/app/auth/register.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/auth/register.component.html b/src/app/auth/register.component.html index 1a0c868..34c50ca 100644 --- a/src/app/auth/register.component.html +++ b/src/app/auth/register.component.html @@ -40,7 +40,7 @@
From 0b2c9c20f82f08b893b78c2f25aa7ead6781f045 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Fri, 10 Nov 2017 14:14:11 +0000 Subject: [PATCH 03/18] Unusable password reset button disabled --- src/app/auth/login.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/auth/login.component.html b/src/app/auth/login.component.html index 5c02b96..db5b7c8 100644 --- a/src/app/auth/login.component.html +++ b/src/app/auth/login.component.html @@ -30,9 +30,9 @@
-
+
From f5239a3822ef1e9748a814c122233d920ee6f90f Mon Sep 17 00:00:00 2001 From: piratefinn Date: Fri, 10 Nov 2017 15:20:48 +0000 Subject: [PATCH 04/18] Added password reset placeholder --- src/app/auth/login.component.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/auth/login.component.html b/src/app/auth/login.component.html index db5b7c8..d1992f5 100644 --- a/src/app/auth/login.component.html +++ b/src/app/auth/login.component.html @@ -30,9 +30,10 @@
- +
+ +
+ From 8a5236ad3a0e3102177fd7361d92d16f22811be2 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Fri, 10 Nov 2017 17:15:11 +0000 Subject: [PATCH 05/18] Leaderboard pages added and routing sorted --- src/app/dashboard/dashboard.module.ts | 4 + src/app/dashboard/dashboard.routing.ts | 7 +- src/app/dashboard/leaderboard.component.html | 59 +++++++++ src/app/dashboard/leaderboard.component.ts | 113 ++++++++++++++++++ src/app/layouts/full-layout.component.html | 7 +- src/app/providers/api-service.ts | 9 +- .../shared/leaderboard-result.component.html | 3 + .../shared/leaderboard-result.component.ts | 19 +++ 8 files changed, 216 insertions(+), 5 deletions(-) create mode 100644 src/app/dashboard/leaderboard.component.html create mode 100644 src/app/dashboard/leaderboard.component.ts create mode 100644 src/app/shared/leaderboard-result.component.html create mode 100644 src/app/shared/leaderboard-result.component.ts diff --git a/src/app/dashboard/dashboard.module.ts b/src/app/dashboard/dashboard.module.ts index a8c59b0..941f8ab 100644 --- a/src/app/dashboard/dashboard.module.ts +++ b/src/app/dashboard/dashboard.module.ts @@ -15,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 { LeaderboardComponent } from './leaderboard.component'; import { MapComponent } from './map.component'; import { GraphWidget } from '../widgets/graph-widget.component'; @@ -26,6 +27,7 @@ import { OrgResultComponent } from '../shared/org-result.component'; import { OrgTableComponent } from '../shared/org-table.component'; import { TransactionResultComponent } from '../shared/transaction-result.component'; import { PayrollResultComponent } from '../shared/payroll-result.component'; +import { LeaderboardResultComponent } from '../shared/leaderboard-result.component'; // API key env variable import import { environment } from '../../environments/environment'; @@ -55,6 +57,8 @@ import { environment } from '../../environments/environment'; TransactionResultComponent, PayrollLogComponent, PayrollResultComponent, + LeaderboardComponent, + LeaderboardResultComponent, MapComponent, FeedbackComponent, GraphWidget, diff --git a/src/app/dashboard/dashboard.routing.ts b/src/app/dashboard/dashboard.routing.ts index f28c65e..ba776f2 100644 --- a/src/app/dashboard/dashboard.routing.ts +++ b/src/app/dashboard/dashboard.routing.ts @@ -38,13 +38,18 @@ const routes: Routes = [ { path: 'account-edit', component: AccountEditComponent, - data: { title: 'Leaderboards' }, + data: { title: 'Edit Account' }, }, { path: 'add-data', component: AddDataComponent, data: { title: 'Add Transaction' }, }, + { + path: 'leaderboard', + component: LeaderboardComponent, + data: { title: 'Leaderboards' }, + }, { path: 'transaction-log', component: TransactionLogComponent, diff --git a/src/app/dashboard/leaderboard.component.html b/src/app/dashboard/leaderboard.component.html new file mode 100644 index 0000000..7eee607 --- /dev/null +++ b/src/app/dashboard/leaderboard.component.html @@ -0,0 +1,59 @@ +
+
+
+
+
+ Leaderboard + By default this loads the page with your position. +
+
+
+ +
+ Action + Another action + Something else here +
+
+ + + + + + + + + + + +
PositionValuePurchase Time
+ + + +
+
+ No Leaderboard available. +
+
+
+
+
diff --git a/src/app/dashboard/leaderboard.component.ts b/src/app/dashboard/leaderboard.component.ts new file mode 100644 index 0000000..7940056 --- /dev/null +++ b/src/app/dashboard/leaderboard.component.ts @@ -0,0 +1,113 @@ +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; +import { Http, Response } from '@angular/http'; +import { ApiService } from '../providers/api-service'; +// import { PaginatePipe } from 'ngx-pagination'; +import {PaginationInstance} from 'ngx-pagination'; +// import { PaginationControlsComponent } from 'ngx-pagination'; +// import { PaginationControlsDirective } from 'ngx-pagination'; +// import { TransactionResultComponent } from '../shared/transaction-result.component'; +import 'rxjs/add/operator/map'; + +@Component({ + templateUrl: 'leaderboard-log.component.html', +}) +export class LeaderboardComponent implements OnInit { + + transactionList; + noLeaderboardList = false; + public p: any; + + leaderboardData: Array; + currentPos: number; + listType: any = 'weekly_total'; + + public paginateConfig: PaginationInstance = { + id: 'leadpaginate', + itemsPerPage: 10, + currentPage: 1, + totalItems: 0 + }; + + constructor( + private http: Http, + private api: ApiService, + ) { + this.myDate = moment().format('YYYY-MM-DD[T]HH:mm'); + // this.myDate = new Date().toISOString().slice(0, 16); + } + + ngOnInit(): void { + this.loadLeaderboard(0); + } + + // private fetchLeaderboard() { + // this.peopleService.leaderboard(this.listType) + // .subscribe( + // result => { + // this.leaderboardData = result.leaderboard; + // this.currentPos = result.user_position; + // } + // ); + // } + + public changeLeaderboard(event) { + this.loadLeaderboard(); + } + + + loadLeaderboard(leadPage: number) { + console.log(leadPage, listType); + this.api.leaderboard_fetch(listType,leadPage).subscribe( + result => { + if (result.transactions.length > 0) { + this.transactionList = result.transactions; + // TODO Rename in server + this.paginateConfig.totalItems = result.page_no; + this.paginateConfig.currentPage = result.page; + this.noLeaderboardList = false; + } else { + // handle the case when the transactionList is empty + this.leaderboardList = null; + this.noLeaderboardList = true; + } + }, + error => { + console.log(error); + } + ); + } + + // // dynamically changes the row style based on player's position + // // for instance, top three player and the player him/herself should + // // be hightlighted + // public getClass(item) { + // if( item.position < 4 ) { + // return "topThree"; + // } else if( item.position == this.currentPos ) { + // return "user"; + // } + // return "otherUsers"; + // } + // + // // show changes by using icon, trending up and trending down or no trend. + // public getTrendIcon(item){ + // if( item.trend < 0 ){ + // return "md-trending-up"; + // } else if( item.trend > 0 ){ + // return "md-trending-down"; + // } + // return "md-remove"; + // } + // + // // need to merge this function with getIcon + // // this function shows different icon color based on the direction of the position shifted + // public getTrendIconColor(item){ + // if( item.trend < 0 ) { + // return "secondary"; + // } else if( item.trend > 0 ){ + // return "danger"; + // } + // return "dark"; + // } + +} diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 4fc7f4c..5dc056b 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -40,11 +40,16 @@ Enter Feedback -
  • +
  • Supplier Map
    • +
  • + + Leaderboard + +
  • Transaction Log diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts index 378035b..bb7f2ad 100644 --- a/src/app/providers/api-service.ts +++ b/src/app/providers/api-service.ts @@ -253,13 +253,16 @@ export class ApiService { // Leaderboard Api - public leaderboard_fetch(data) { + public leaderboard_fetch( + type: string, + page: number) { const key = this.sessionKey; return this.http.post( - this.apiUrl + '/stats/leaderboard', + this.apiUrl + '/stats/leaderboard/paged', { session_key : key, - type : data + type : type, + page: page, } ).map( response => response.json() ); } diff --git a/src/app/shared/leaderboard-result.component.html b/src/app/shared/leaderboard-result.component.html new file mode 100644 index 0000000..8a728ba --- /dev/null +++ b/src/app/shared/leaderboard-result.component.html @@ -0,0 +1,3 @@ +{{ item.position }} +{{ item.display_name }} +{{ listType.includes('total') ? (item.value | currency:'GBP':true:'1.2-2') : (item.value | number:'1.0-0') }} diff --git a/src/app/shared/leaderboard-result.component.ts b/src/app/shared/leaderboard-result.component.ts new file mode 100644 index 0000000..53fce68 --- /dev/null +++ b/src/app/shared/leaderboard-result.component.ts @@ -0,0 +1,19 @@ +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; + +interface LeaderboardData { + seller: number; + value: number; + purchase_time: string; +} + +@Component({ + // tslint:disable-next-line + selector: '[leaderboard-result]', + templateUrl: 'leaderboard-result.component.html', +}) +export class LeaderboardResultComponent implements OnInit { + @Input() public leaderboard: leaderboardData; + + ngOnInit(): void { + } +} From faea82d2cc3d20e2c2453b5c1daf483e6fad7d3d Mon Sep 17 00:00:00 2001 From: piratefinn Date: Fri, 10 Nov 2017 17:17:04 +0000 Subject: [PATCH 06/18] route fix --- src/app/dashboard/leaderboard.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/dashboard/leaderboard.component.ts b/src/app/dashboard/leaderboard.component.ts index 7940056..710e704 100644 --- a/src/app/dashboard/leaderboard.component.ts +++ b/src/app/dashboard/leaderboard.component.ts @@ -9,7 +9,7 @@ import {PaginationInstance} from 'ngx-pagination'; import 'rxjs/add/operator/map'; @Component({ - templateUrl: 'leaderboard-log.component.html', + templateUrl: 'leaderboard.component.html', }) export class LeaderboardComponent implements OnInit { From c4a9790eb88f3f834c107ef898caf50d2ed53de8 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Fri, 10 Nov 2017 18:41:35 +0000 Subject: [PATCH 07/18] Web app leaderboard done --- src/app/dashboard/dashboard.routing.ts | 1 + src/app/dashboard/leaderboard.component.html | 22 ++++++++++--------- src/app/dashboard/leaderboard.component.ts | 21 ++++++++---------- .../shared/leaderboard-result.component.html | 6 ++--- .../shared/leaderboard-result.component.ts | 7 +++--- 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/app/dashboard/dashboard.routing.ts b/src/app/dashboard/dashboard.routing.ts index ba776f2..d0e56fe 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 { LeaderboardComponent } from './leaderboard.component'; import { MapComponent } from './map.component'; // Using child path to allow for FullLayout theming diff --git a/src/app/dashboard/leaderboard.component.html b/src/app/dashboard/leaderboard.component.html index 7eee607..34345f3 100644 --- a/src/app/dashboard/leaderboard.component.html +++ b/src/app/dashboard/leaderboard.component.html @@ -7,15 +7,17 @@ By default this loads the page with your position.
    -
    - -
    - Action - Another action - Something else here -
    +
    +
    @@ -26,7 +28,7 @@ - +
    { - if (result.transactions.length > 0) { - this.transactionList = result.transactions; + if (result.leaderboard.length > 0) { + this.leaderboardList = result.leaderboard; // TODO Rename in server - this.paginateConfig.totalItems = result.page_no; + this.paginateConfig.totalItems = result.count; this.paginateConfig.currentPage = result.page; this.noLeaderboardList = false; } else { - // handle the case when the transactionList is empty + // handle the case when the leaderboardList is empty this.leaderboardList = null; this.noLeaderboardList = true; } diff --git a/src/app/shared/leaderboard-result.component.html b/src/app/shared/leaderboard-result.component.html index 8a728ba..76e4d3c 100644 --- a/src/app/shared/leaderboard-result.component.html +++ b/src/app/shared/leaderboard-result.component.html @@ -1,3 +1,3 @@ -{{ item.position }} -{{ item.display_name }} -{{ listType.includes('total') ? (item.value | currency:'GBP':true:'1.2-2') : (item.value | number:'1.0-0') }} +{{ leaderboard.position }} +{{ leaderboard.display_name }} +{{ listType.includes('total') ? (leaderboard.value | currency:'GBP':true:'1.2-2') : (leaderboard.value | number:'1.0-0') }} diff --git a/src/app/shared/leaderboard-result.component.ts b/src/app/shared/leaderboard-result.component.ts index 53fce68..925f331 100644 --- a/src/app/shared/leaderboard-result.component.ts +++ b/src/app/shared/leaderboard-result.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; interface LeaderboardData { - seller: number; + position: number; + display_name: number, value: number; - purchase_time: string; } @Component({ @@ -12,7 +12,8 @@ interface LeaderboardData { templateUrl: 'leaderboard-result.component.html', }) export class LeaderboardResultComponent implements OnInit { - @Input() public leaderboard: leaderboardData; + @Input() public leaderboard: LeaderboardData; + @Input() public listType: string; ngOnInit(): void { } From 8f725b93af52b447f61c75c7ed83f28456199986 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 13 Nov 2017 12:26:24 +0000 Subject: [PATCH 08/18] Fixed authguard --- src/app/layouts/full-layout.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 5dc056b..7df1b61 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -40,12 +40,12 @@ Enter Feedback
    • -
  • +
  • Supplier Map
    • -
  • +
  • Leaderboard From 30093656829a4dcc4464db256b70d2479f30b65b Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 13 Nov 2017 12:39:31 +0000 Subject: [PATCH 09/18] Map changed and made available to customers --- src/app/dashboard/dashboard.routing.ts | 4 ++-- src/app/dashboard/map.component.html | 2 +- src/app/layouts/full-layout.component.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/dashboard/dashboard.routing.ts b/src/app/dashboard/dashboard.routing.ts index d0e56fe..9794cfe 100644 --- a/src/app/dashboard/dashboard.routing.ts +++ b/src/app/dashboard/dashboard.routing.ts @@ -50,6 +50,7 @@ const routes: Routes = [ path: 'leaderboard', component: LeaderboardComponent, data: { title: 'Leaderboards' }, + canActivate: [CustomerGuard], }, { path: 'transaction-log', @@ -59,8 +60,7 @@ const routes: Routes = [ { path: 'map', component: MapComponent, - data: { title: 'Supplier Map' }, - canActivate: [OrgGuard], + data: { title: 'Purchase Map' }, }, { path: 'payroll-log', diff --git a/src/app/dashboard/map.component.html b/src/app/dashboard/map.component.html index 1c408a4..28b375f 100644 --- a/src/app/dashboard/map.component.html +++ b/src/app/dashboard/map.component.html @@ -3,7 +3,7 @@
    - Supplier Map + Purchase Map Required Data marked in bold.
    diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 7df1b61..959ef60 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -42,7 +42,7 @@
  • - Supplier Map + Purchase Map
  • From 03299fb5a8139e2f075610ca72b7fd3ab19c6edb Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 13 Nov 2017 12:47:32 +0000 Subject: [PATCH 10/18] Changelog updated --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e6321b..7c16586 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ # Next Release +* Customer Leaderboards added +* Map made available to Customers +* Map renamed from "Supplier Map" to "Purchase Map" to fall in line with +previous change +* Added placeholder while password reset is not present +* Fixed error on store list during a transaction + + # v0.0.2 * Supplier map added to organisation view From a5b73c7e59bfceca49a82fcc6a5b4580bf18c56e Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 13 Nov 2017 13:05:42 +0000 Subject: [PATCH 11/18] Transaction fix added --- src/app/dashboard/add-data.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/dashboard/add-data.component.ts b/src/app/dashboard/add-data.component.ts index 13589c7..c894a84 100644 --- a/src/app/dashboard/add-data.component.ts +++ b/src/app/dashboard/add-data.component.ts @@ -237,7 +237,7 @@ export class AddDataComponent implements OnInit { town: '', postcode: '', }; - this.storeList = null; + this.storeList = []; this.amount = null; this.transactionFormInvalid = true; this.showAddStore = false; From 06886856769e40787c197cd0ec43e17809e23148 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 13 Nov 2017 15:49:17 +0000 Subject: [PATCH 12/18] changed login username input to email and changed test --- e2e/login.e2e-spec.ts | 4 ++-- src/app/auth/login.component.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/e2e/login.e2e-spec.ts b/e2e/login.e2e-spec.ts index 7fc72be..2bb5bd5 100644 --- a/e2e/login.e2e-spec.ts +++ b/e2e/login.e2e-spec.ts @@ -12,9 +12,9 @@ describe('Login Page', () => { expect(page.getLoginHeaderText()).toEqual('Login'); }); - it('should have a username box of type text', () => { + it('should have a username box of type email', () => { expect(page.isUsernameFieldPresent()).toBeTruthy(); - expect(page.getUsernameFieldType()).toBe('text'); + expect(page.getUsernameFieldType()).toEqual('email'); }); it('should have a password box of type password', () => { diff --git a/src/app/auth/login.component.html b/src/app/auth/login.component.html index d1992f5..9a87e9b 100644 --- a/src/app/auth/login.component.html +++ b/src/app/auth/login.component.html @@ -10,7 +10,7 @@
    @ - +
    From 0286887ead0b02bfe81f7da6503fa9c10353f767 Mon Sep 17 00:00:00 2001 From: Finn Date: Mon, 13 Nov 2017 22:21:59 +0000 Subject: [PATCH 13/18] Initial agmcluster commit with broken maxZoom --- package-lock.json | 10 ++++++++++ package.json | 2 ++ src/app/dashboard/dashboard.module.ts | 2 ++ src/app/dashboard/map.component.html | 20 +++++++++++--------- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 655bc51..c2c5926 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,11 @@ "resolved": "https://registry.npmjs.org/@agm/core/-/core-1.0.0-beta.1.tgz", "integrity": "sha512-IVwQGmcaE42SmYY2e5QwqOC0vrSXZCW8BhATY0Vpy3NjbiydSXi9T81hVqKLvuKaB3ves1sv3W++SB1Wj+5B6A==" }, + "@agm/js-marker-clusterer": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/@agm/js-marker-clusterer/-/js-marker-clusterer-1.0.0-beta.2.tgz", + "integrity": "sha512-sQzNo+2NwjgVAiy/AU3deYvemoH3CHtYvh+aH/3jq9yIK+2ZiuwhZ2oKmoBsVPEMzLjOqF07FhDLowrAAZfVRw==" + }, "@angular-devkit/build-optimizer": { "version": "0.0.13", "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.13.tgz", @@ -4650,6 +4655,11 @@ "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=", "dev": true }, + "js-marker-clusterer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/js-marker-clusterer/-/js-marker-clusterer-1.0.0.tgz", + "integrity": "sha1-yUvoWuiJaBnlHBMfiR3StVVY3Rc=" + }, "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", diff --git a/package.json b/package.json index 5560151..15af575 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "private": true, "dependencies": { "@agm/core": "^1.0.0-beta.1", + "@agm/js-marker-clusterer": "^1.0.0-beta.2", "@angular/common": "4.0.3", "@angular/compiler": "4.0.3", "@angular/core": "4.0.3", @@ -32,6 +33,7 @@ "angular-in-memory-web-api": "^0.3.1", "chart.js": "2.5.0", "core-js": "2.4.1", + "js-marker-clusterer": "^1.0.0", "moment": "^2.18.1", "ng2-charts": "1.6.0", "ng2-validation-manager": "^0.3.1", diff --git a/src/app/dashboard/dashboard.module.ts b/src/app/dashboard/dashboard.module.ts index 941f8ab..341e833 100644 --- a/src/app/dashboard/dashboard.module.ts +++ b/src/app/dashboard/dashboard.module.ts @@ -5,6 +5,7 @@ import { ChartsModule } from 'ng2-charts/ng2-charts'; import { BsDropdownModule } from 'ngx-bootstrap/dropdown'; import { NgxPaginationModule } from 'ngx-pagination'; import { AgmCoreModule, GoogleMapsAPIWrapper } from '@agm/core'; +import { AgmJsMarkerClustererModule } from '@agm/js-marker-clusterer'; import { CurrencyPipe } from '@angular/common'; @@ -42,6 +43,7 @@ import { environment } from '../../environments/environment'; AgmCoreModule.forRoot({ apiKey: environment.mapApiKey }), + AgmJsMarkerClustererModule, BsDropdownModule, NgxPaginationModule, DashboardRoutingModule, diff --git a/src/app/dashboard/map.component.html b/src/app/dashboard/map.component.html index 28b375f..baa562d 100644 --- a/src/app/dashboard/map.component.html +++ b/src/app/dashboard/map.component.html @@ -22,16 +22,18 @@ [zoom]="zoom" [scaleControl]="true" (idle)="viewBoundsChanged($event)"> - + + - - {{m.name}} - - + + {{m.name}} + + +
    From 52834af3fc7002a1c8aa9bcdc835b14f27f7a011 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Tue, 14 Nov 2017 11:03:19 +0000 Subject: [PATCH 14/18] Fixed and working zoom level change --- src/app/dashboard/map.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/dashboard/map.component.html b/src/app/dashboard/map.component.html index baa562d..bcff523 100644 --- a/src/app/dashboard/map.component.html +++ b/src/app/dashboard/map.component.html @@ -22,7 +22,7 @@ [zoom]="zoom" [scaleControl]="true" (idle)="viewBoundsChanged($event)"> - + Date: Tue, 14 Nov 2017 11:08:17 +0000 Subject: [PATCH 15/18] Changelog updated --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c16586..975fb59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * Customer Leaderboards added * Map made available to Customers +* Clustering added to Map * Map renamed from "Supplier Map" to "Purchase Map" to fall in line with previous change * Added placeholder while password reset is not present From c4d1bf5a07c199069d24dd7f3ac30923b841eda3 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Tue, 14 Nov 2017 11:12:29 +0000 Subject: [PATCH 16/18] Fix build-release script to put stuff in a folder --- bin/build-releases | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/build-releases b/bin/build-releases index 0a840d2..1abdb98 100755 --- a/bin/build-releases +++ b/bin/build-releases @@ -2,19 +2,24 @@ VERSION=`git describe --tags` +if [ ! -d ../WebApp-Releases ]; then + echo "Making new Releases Directory" + mkdir ../WebApp-Releases +fi + echo "Building releases for $VERSION" echo "Building Prod Release..." ng build --prod -tar -czf ../LocalLoop-Web-prod-$VERSION.tar.gz dist +tar -czf ../WebApp-Releases/LocalLoop-Web-prod-$VERSION.tar.gz dist echo "Building Dev Release..." ng build --dev -tar -cvzf ../LocalLoop-Web-dev-$VERSION.tar.gz dist +tar -czf ../WebApp-Releases/LocalLoop-Web-dev-$VERSION.tar.gz dist echo "Cleaning up build artefacts..." From 63006e4be1fad1e756227ff0886b572bd97a4129 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Tue, 14 Nov 2017 11:13:25 +0000 Subject: [PATCH 17/18] Bump version number in Changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 975fb59..6502546 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ # Next Release +# v0.0.3 + * Customer Leaderboards added * Map made available to Customers * Clustering added to Map From 663d78e4bfce49a7eaa6ba949b7cf4183184ac43 Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Tue, 14 Nov 2017 11:18:34 +0000 Subject: [PATCH 18/18] Bump package version number --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index c2c5926..b05c84c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "localloop-web", - "version": "0.0.2", + "version": "0.0.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -7989,6 +7989,14 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", @@ -7999,14 +8007,6 @@ "strip-ansi": "3.0.1" } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "5.1.1" - } - }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", diff --git a/package.json b/package.json index 15af575..2a5c6eb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "localloop-web", - "version": "0.0.2", + "version": "0.0.3", "description": "LocalLoop Web - Web interface for LocalLoop app", "author": "", "url": "http://www.peartrade.org",