From 16ef46972e084e64255afae22030969d6e2df436 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 29 Nov 2017 16:19:38 +0000 Subject: [PATCH 001/215] fixed typo --- src/app/dashboard/map.component.html | 2 +- src/app/dashboard/trail-map.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/dashboard/map.component.html b/src/app/dashboard/map.component.html index ab9a97e..9cdf1be 100644 --- a/src/app/dashboard/map.component.html +++ b/src/app/dashboard/map.component.html @@ -3,7 +3,7 @@
- Lancaster Independent Story + Purchase Map Required Data marked in bold.
- Purchase Map + Lancaster Independent Story Required Data marked in bold.
Date: Wed, 29 Nov 2017 16:52:31 +0000 Subject: [PATCH 002/215] Updated changelog and bumped version number in all packages --- CHANGELOG.md | 4 ++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c894d71..e8f71a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ # Next Release +# v0.0.6 + +* Fix typo in Map Titles + # v0.0.5 * Change page name from Story Trail to Lancaster Independent Story diff --git a/package-lock.json b/package-lock.json index 60d8164..6d0ed01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "localloop-web", - "version": "0.0.5", + "version": "0.0.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d9af127..090cbf1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "localloop-web", - "version": "0.0.5", + "version": "0.0.6", "description": "LocalLoop Web - Web interface for LocalLoop app", "author": "", "url": "http://www.peartrade.org", From 0ce452233d13925b7ca326e675381588340aaea2 Mon Sep 17 00:00:00 2001 From: Thomas Bloor Date: Wed, 29 Nov 2017 17:12:18 +0000 Subject: [PATCH 003/215] Setup Travis to auto build releases when a tag is created --- .travis.yml | 19 ++++++++++++++++--- src/environments/environment.dev.ts.enc | Bin 0 -> 160 bytes src/environments/environment.prod.ts.enc | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 src/environments/environment.dev.ts.enc create mode 100644 src/environments/environment.prod.ts.enc diff --git a/.travis.yml b/.travis.yml index 22ae810..13fa1cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,25 @@ 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 + - 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 - npm config set spin false install: - - npm install + - npm install script: - - npm run ci + - npm run ci +before_deploy: + - openssl aes-256-cbc -K $encrypted_9d2af3734b6c_key -iv $encrypted_9d2af3734b6c_iv -in src/environments/environment.prod.ts.enc -out src/environments/environment.prod.ts -d + - openssl aes-256-cbc -K $encrypted_9d2af3734b6c_key -iv $encrypted_9d2af3734b6c_iv -in src/environments/environment.dev.ts.enc -out src/environments/environment.dev.ts -d + - ./bin/build-releases +deploy: + provider: releases + api_key: + secure: IZKEl1/LnzCN4/uMPKqUktURoNFjDmrybGKwrKbTPS27iXLrC9x4NwrQnOgipLF5h6Jeee4Qf1LhFCEpL/VTBTGMljQU2uOUFqn7TTGV5Ok7wxn2Z4CYeLDHMqDeGEECidAs8pB7I8lQvk5iUqmQT0NbuB0tDgavM9XCAecGUrFHh2tQaqPRGgZ1Q+1QB5d68EItSncMFKgRKja3Jq3u6ArF3uR3qY0dx9UKgcSUkKMnYbkBoEmiuCthdtwsH6WiIp4+K5GnVkGWxFa6KwdUJseHvUCuwS0Jp6lz47fP75xr4pHP45BxL7s549P60Iyr5AMRUge2+LPQV5QdbRH4guQV6qWI2L6Vw64fdC3lK00MhNFNO4M9p1T9eeldXhvUJwBDjzjoHlsrZysUMBy5G9CpQIVJtaPSVMWm/9yfPbu/B3k85cCHLb3fTos3altCWREIUScWIdDAHczJmmITUE9d5KljT8t2gLzCiCqB3BQ6ZzN8Ur68EIJ2ePuCO4644S+1shg5AXYDzXuUd30J57UGnuELQSMQkuZvMUQy8PmNO/iInIqpnuAwOwT4YD0MHgXrjD38a9+KszDjY+9HrIWcQE8P7AuN0iVf2voB5uLTOckkd4mXF9sskwoREVYJM+jz49HViggYyn1MHLsnlY5//vhMo5HNaf2DtT8fhk4= + file_glob: true + file: "../WebApp-Releases/*" + skip_cleanup: true + on: + tags: true diff --git a/src/environments/environment.dev.ts.enc b/src/environments/environment.dev.ts.enc new file mode 100644 index 0000000000000000000000000000000000000000..0e82614abef894788e75785aa41ba9b02b92e593 GIT binary patch literal 160 zcmV;R0AK$k3o%fna7ct{48kUm6^q|Xtx_%UDy{)^t)s43fTt(Y1MGpZ;6U89H^etU z_&A!juf6Mkz^|S`o0HGmghA@nn}&j%{v$bW2BqJr7R{}p+z$F;>Szt_xl2GtK1fi= z>e(*}#@Y{1sROR%CC!8~+VV+v8yD{QJYiED)h$oduwFF3&FCYxlVt3`VIl>ifveDj Os<>grBG};oS$Zi$dQpY| literal 0 HcmV?d00001 diff --git a/src/environments/environment.prod.ts.enc b/src/environments/environment.prod.ts.enc new file mode 100644 index 0000000..f9eabd4 --- /dev/null +++ b/src/environments/environment.prod.ts.enc @@ -0,0 +1,2 @@ +4Q'DUػc+q{E/h)z_k"%ܝ~0M/sl<@];R佨BPs삅Sܿe7A'ObOú +>9+΄ʫaOikwfk+)1 \ No newline at end of file From d9b8ebfc5030c6eb7b415a359d6f7cd6866d3e46 Mon Sep 17 00:00:00 2001 From: Thomas Bloor Date: Wed, 29 Nov 2017 17:24:16 +0000 Subject: [PATCH 004/215] Travis can only manage one file for decryption it seems --- .gitignore | 1 + .travis.yml | 5 ++--- src/environments/environment.ci.ts.enc | 2 -- src/environments/environment.dev.ts.enc | Bin 160 -> 0 bytes src/environments/environment.prod.ts.enc | 2 -- src/environments/environments.tar.enc | Bin 0 -> 10256 bytes 6 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 src/environments/environment.ci.ts.enc delete mode 100644 src/environments/environment.dev.ts.enc delete mode 100644 src/environments/environment.prod.ts.enc create mode 100644 src/environments/environments.tar.enc diff --git a/.gitignore b/.gitignore index 67d6c52..00dbdc8 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ testem.log /src/environments/environment.prod.ts /src/environments/environment.dev.ts /src/environments/environment.ci.ts +/src/environments/environments.tar # ========================= # Operating System Files diff --git a/.travis.yml b/.travis.yml index 13fa1cc..f0c1c52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,8 @@ 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 + - openssl aes-256-cbc -K $encrypted_9d2af3734b6c_key -iv $encrypted_9d2af3734b6c_iv -in src/environments/environments.tar.enc -out src/environments/environments.tar -d + - tar xf src/environments/environments.tar -C src/environments before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start @@ -14,8 +15,6 @@ install: script: - npm run ci before_deploy: - - openssl aes-256-cbc -K $encrypted_9d2af3734b6c_key -iv $encrypted_9d2af3734b6c_iv -in src/environments/environment.prod.ts.enc -out src/environments/environment.prod.ts -d - - openssl aes-256-cbc -K $encrypted_9d2af3734b6c_key -iv $encrypted_9d2af3734b6c_iv -in src/environments/environment.dev.ts.enc -out src/environments/environment.dev.ts -d - ./bin/build-releases deploy: provider: releases diff --git a/src/environments/environment.ci.ts.enc b/src/environments/environment.ci.ts.enc deleted file mode 100644 index d7f9745..0000000 --- a/src/environments/environment.ci.ts.enc +++ /dev/null @@ -1,2 +0,0 @@ -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 diff --git a/src/environments/environment.dev.ts.enc b/src/environments/environment.dev.ts.enc deleted file mode 100644 index 0e82614abef894788e75785aa41ba9b02b92e593..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 160 zcmV;R0AK$k3o%fna7ct{48kUm6^q|Xtx_%UDy{)^t)s43fTt(Y1MGpZ;6U89H^etU z_&A!juf6Mkz^|S`o0HGmghA@nn}&j%{v$bW2BqJr7R{}p+z$F;>Szt_xl2GtK1fi= z>e(*}#@Y{1sROR%CC!8~+VV+v8yD{QJYiED)h$oduwFF3&FCYxlVt3`VIl>ifveDj Os<>grBG};oS$Zi$dQpY| diff --git a/src/environments/environment.prod.ts.enc b/src/environments/environment.prod.ts.enc deleted file mode 100644 index f9eabd4..0000000 --- a/src/environments/environment.prod.ts.enc +++ /dev/null @@ -1,2 +0,0 @@ -4Q'DUػc+q{E/h)z_k"%ܝ~0M/sl<@];R佨BPs삅Sܿe7A'ObOú ->9+΄ʫaOikwfk+)1 \ No newline at end of file diff --git a/src/environments/environments.tar.enc b/src/environments/environments.tar.enc new file mode 100644 index 0000000000000000000000000000000000000000..d5414b3ee25b6d1368da1825f2323eecb65994e9 GIT binary patch literal 10256 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 WRnrYxSoh>R?)tcFy^K~|3$Z+JmFZ>x literal 0 HcmV?d00001 From 830b4b3c4f719d6447ce71f5c85023aa38e4bedb Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 29 Nov 2017 18:07:37 +0000 Subject: [PATCH 005/215] fixed navbar alignment --- src/app/layouts/full-layout.component.html | 40 +++++++++++++++++----- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index ca24198..e01170d 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -27,42 +27,66 @@ From 0cc3a473cf26014b4a992237c040e2e91a3e2d8d Mon Sep 17 00:00:00 2001 From: piratefinn Date: Fri, 8 Dec 2017 13:26:18 +0000 Subject: [PATCH 006/215] changed code for trail map --- src/app/dashboard/trail-map.component.html | 8 ++++++-- src/app/dashboard/trail-map.component.ts | 9 +++++++-- src/app/providers/api-service.ts | 6 +++--- .../lis-map-pin.png} | Bin src/assets/img/{ => association}/lis_logo.png | Bin 5 files changed, 16 insertions(+), 7 deletions(-) rename src/assets/img/{map-pin-lis.png => association/lis-map-pin.png} (100%) rename src/assets/img/{ => association}/lis_logo.png (100%) diff --git a/src/app/dashboard/trail-map.component.html b/src/app/dashboard/trail-map.component.html index 06818fa..e55329c 100644 --- a/src/app/dashboard/trail-map.component.html +++ b/src/app/dashboard/trail-map.component.html @@ -5,6 +5,10 @@
Lancaster Independent Story Required Data marked in bold. +
diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts index 68c4913..87b5419 100644 --- a/src/app/dashboard/dashboard-customer.component.ts +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -26,18 +26,6 @@ export class DashboardCustomerComponent implements OnInit { public polarAreaChartType = 'polarArea'; public widgetList = [ - { - type: 'graph', - name: 'total_today', - title: 'Total Today', - dataType: DataType.currency, - }, - { - type: 'graph', - name: 'avg_spend_today', - title: 'Avg. Spend Today', - dataType: DataType.currency, - }, { type: 'graph', name: 'total_last_week', @@ -64,18 +52,6 @@ export class DashboardCustomerComponent implements OnInit { title: 'Last Month Avg. Spend', dataType: DataType.currency, }, - { - type: 'graph', - name: 'total_user', - title: 'User Total', - dataType: DataType.currency, - }, - { - type: 'graph', - name: 'avg_spend_user', - title: 'User Avg. Spend', - dataType: DataType.currency, - }, ]; constructor( diff --git a/src/app/panels/pie-panel.component.html b/src/app/panels/pie-panel.component.html index 291c778..bb90dff 100644 --- a/src/app/panels/pie-panel.component.html +++ b/src/app/panels/pie-panel.component.html @@ -16,8 +16,8 @@
= []; - - public chartData: Array = [ - { - data: [], - label: 'This Week' - }, - { - data: [], - label: 'Last Week' - }, - { - data: [], - label: 'Week Before Last' - } - ]; - - public rawChartLabels: Array = []; - public chartLabels: Array = []; - // public mainChartElements = 7; constructor( - private graphService: OrgGraphsService, + private pieService: CustPiesService, ) { } public ngOnInit(): void { - // const end = moment().startOf('day'); - // const start = end.clone().subtract(this.mainChartElements * 3, 'days'); - // this.graphService.getGraph('customers_range', { - // start: start.format('YYYY-MM-DD'), - // end: end.format('YYYY-MM-DD'), - // }).subscribe( result => this.setData(result.graph) ); + this.pieService.getPie() + .subscribe( result => this.setData(result.pie) ); } - // private setData(data: any) { - // this.chartLabels = data.labels.slice(this.mainChartElements * 2, this.mainChartElements * 3); - // this.chartData[2].data = data.data.slice(0, this.mainChartElements); - // this.chartData[1].data = data.data.slice(this.mainChartElements, this.mainChartElements * 2); - // this.chartData[0].data = data.data.slice(this.mainChartElements * 2, this.mainChartElements * 3); - // } + private setData(data: any) { + this.doughnutChartData = Object.values(data); + console.log(this.chartData); + // setTimeout is currently a workaround for ng2-charts labels + setTimeout(() => this.doughnutChartLabels = Object.keys(data), 0); + console.log(this.chartLabels); + } // convert Hex to RGBA public convertHex(hex: string, opacity: number) { diff --git a/src/app/providers/cust-pies.service.ts b/src/app/providers/cust-pies.service.ts new file mode 100644 index 0000000..4608369 --- /dev/null +++ b/src/app/providers/cust-pies.service.ts @@ -0,0 +1,14 @@ +import { Injectable } from '@angular/core'; +import { ApiService } from './api-service'; +import { Observable } from 'rxjs/Rx'; + +@Injectable() +export class CustPiesService { + private custPieUrl = '/v1/customer/pies'; + + constructor(private api: ApiService) { } + + public getPie(): Observable { + return this.api.post(this.custPieUrl); + } +} diff --git a/src/app/widgets/graph-widget.component.ts b/src/app/widgets/graph-widget.component.ts index 3d99096..8c5b55d 100644 --- a/src/app/widgets/graph-widget.component.ts +++ b/src/app/widgets/graph-widget.component.ts @@ -35,12 +35,21 @@ export class GraphWidget implements OnInit { maintainAspectRatio: false, scales: { xAxes: [{ + type: 'time', + time: { + unit: 'day', + displayFormats: { + day: 'MMM D', + }, + tooltipFormat: 'MMM D', + }, gridLines: { color: 'transparent', zeroLineColor: 'transparent' }, ticks: { fontSize: 2, + source: 'data', fontColor: 'transparent', } @@ -106,6 +115,12 @@ export class GraphWidget implements OnInit { private setData(data: any) { this.setChartData(data.data); this.setChartLabels(data.labels); + this.setChartBounds(data.bounds); + } + + private setChartBounds(data) { + this.lineChartOptions.scales.xAxes[0].time.max = data.max; + this.lineChartOptions.scales.xAxes[0].time.min = data.min; } private setChartData(data: Array) { From 93f15ae6de46a8a25246f858ceaebc9aa9f3cca9 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Thu, 14 Dec 2017 17:51:00 +0000 Subject: [PATCH 016/215] improved doughnut header layout --- src/app/panels/pie-panel.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/panels/pie-panel.component.html b/src/app/panels/pie-panel.component.html index bb90dff..eb0c194 100644 --- a/src/app/panels/pie-panel.component.html +++ b/src/app/panels/pie-panel.component.html @@ -1,10 +1,10 @@
-
+

Local Purchases

-
+
-
-
+
-
+
@@ -27,37 +26,78 @@
  • This Week - 191,235 (56%) + {{ (weekPurchaseList.week_0 || 0 ) }} ({{ (weekPurchaseList.week_0 || 0 ) / maxPurchase | percent:'1.0-0' }})
    -
    -
    +
    +
  • Last Week - 51,223 (15%) + {{ weekPurchaseList.week_1 || 0 }} ({{ (weekPurchaseList.week_1 || 0 ) / maxPurchase | percent:'1.0-0' }})
    -
    -
    +
    +
  • 2 Weeks Ago - 37,564 (11%) + {{ weekPurchaseList.week_2 || 0 }} ({{ (weekPurchaseList.week_2 || 0 ) / maxPurchase | percent:'1.0-0' }})
    -
    -
    +
    +
  • 3 Weeks Ago - 27,319 (8%) + {{ weekPurchaseList.week_3 || 0 }} ({{ (weekPurchaseList.week_3 || 0 ) / maxPurchase | percent:'1.0-0' }})
    -
    -
    +
    +
    +
    +
    +
    • +
  • + 4 Weeks Ago + {{ weekPurchaseList.week_4 || 0 }} ({{ (weekPurchaseList.week_4 || 0 ) / maxPurchase | percent:'1.0-0' }}) +
    +
    +
    +
    +
    +
    • +
  • + 5 Weeks Ago + {{ weekPurchaseList.week_5 || 0 }} ({{ (weekPurchaseList.week_5 || 0 ) / maxPurchase | percent:'1.0-0' }}) +
    +
    +
    +
    +
    +
    • +
  • + 6 Weeks Ago + {{ weekPurchaseList.week_6 || 0 }} ({{ (weekPurchaseList.week_6 || 0 ) / maxPurchase | percent:'1.0-0' }}) +
    +
    +
    • @@ -66,7 +106,7 @@
-
+
@@ -83,7 +123,7 @@ Lorem ipsum dolor sit amet
-
Bought this week
+
Bought from Sector
1.924
@@ -94,7 +134,7 @@ Lorem ipsum dolor sit amet
-
Bought this week
+
Bought from Sector
1.224
@@ -105,7 +145,7 @@ Lorem ipsum dolor sit amet
-
Bought this week
+
Bought from Sector
1.163
@@ -116,7 +156,7 @@ Lorem ipsum dolor sit amet
-
Bought this week
+
Bought from Sector
928
@@ -127,7 +167,7 @@ Lorem ipsum dolor sit amet
-
Bought this week
+
Bought from Sector
893
@@ -138,7 +178,7 @@ Lorem ipsum dolor sit amet
-
Bought this week
+
Bought from Sector
121.924
@@ -149,7 +189,7 @@ Lorem ipsum dolor sit amet
-
Bought this week
+
Bought from Sector
12.125
diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts index 87b5419..f404496 100644 --- a/src/app/dashboard/dashboard-customer.component.ts +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -19,12 +19,19 @@ export class DashboardCustomerComponent implements OnInit { myRank: any; username: any; - // PolarArea - public polarAreaChartLabels: string[] = ['Local', 'Not Local']; - public polarAreaChartData: number[] = [400, 100]; - public polarAreaLegend = true; - public polarAreaChartType = 'polarArea'; + weekPurchaseList = { + week_0: 0, + week_1: 0, + week_2: 0, + week_3: 0, + week_4: 0, + week_5: 0, + week_6: 0, + }; + sectorList: any; + + // Graph widgets public widgetList = [ { type: 'graph', @@ -57,6 +64,35 @@ export class DashboardCustomerComponent implements OnInit { constructor( private api: ApiService, ) { + this.api.basicStats().subscribe( + result => { + this.setWeekPurchaseList(result.data); + + }, + error => { + console.log('Retrieval Error'); + console.log( error._body ); + } + ); + } + + public setWeekPurchaseList (data: any) { + this.weekPurchaseList = { + week_0: data.purchases[0], + week_1: data.purchases[1], + week_2: data.purchases[2], + week_3: data.purchases[3], + week_4: data.purchases[4], + week_5: data.purchases[5], + week_6: data.purchases[6], + }; + //this.maxPurchase = Math.max(...this.weekPurchaseList); + this.maxPurchase = Object.values(this.weekPurchaseList).reduce((a,b) => { + if (! a) { a = 0 } + if (! b) { b = 0 } + return Math.max(a,b); + }); + console.log(this.maxPurchase); } ngOnInit(): void { diff --git a/src/app/panels/pie-panel.component.ts b/src/app/panels/pie-panel.component.ts index e102b33..3e8d2ac 100644 --- a/src/app/panels/pie-panel.component.ts +++ b/src/app/panels/pie-panel.component.ts @@ -30,10 +30,8 @@ export class PiePanel implements OnInit { private setData(data: any) { this.doughnutChartData = Object.values(data); - console.log(this.chartData); // setTimeout is currently a workaround for ng2-charts labels setTimeout(() => this.doughnutChartLabels = Object.keys(data), 0); - console.log(this.chartLabels); } // convert Hex to RGBA From e16cf3e801fba5150c5af811b3c96f60de3dda8d Mon Sep 17 00:00:00 2001 From: piratefinn Date: Fri, 15 Dec 2017 17:20:18 +0000 Subject: [PATCH 018/215] sector list code fully working --- .../dashboard-customer.component.html | 56 +++++++++--------- .../dashboard/dashboard-customer.component.ts | 59 ++++++++++++++++++- 2 files changed, 84 insertions(+), 31 deletions(-) diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html index 1278c05..5be3628 100644 --- a/src/app/dashboard/dashboard-customer.component.html +++ b/src/app/dashboard/dashboard-customer.component.html @@ -117,80 +117,80 @@
  • - +
    -
    Sector A
    - Lorem ipsum dolor sit amet +
    Sector {{ sectorLetters[0] || 'N/A' }}
    +
    {{ sectorNames [sectorLetters[0]] }}
    Bought from Sector
    - 1.924 + {{ sectorPurchases[0] || 'N/A' }}
  • - +
    -
    Sector B
    - Lorem ipsum dolor sit amet +
    Sector {{ sectorLetters[1] || 'N/A' }}
    + {{ sectorNames [sectorLetters[1]] || 'N/A' }}
    Bought from Sector
    - 1.224 + {{ sectorPurchases[1] || 'N/A' }}
  • - +
    -
    Sector C
    - Lorem ipsum dolor sit amet +
    Sector {{ sectorLetters[2] || 'N/A' }}
    + {{ sectorNames [sectorLetters[2]] || 'N/A' }}
    Bought from Sector
    - 1.163 + {{ sectorPurchases[2] || 'N/A' }}
  • - +
    -
    Sector D
    - Lorem ipsum dolor sit amet +
    Sector {{ sectorLetters[3] || 'N/A' }}
    + {{ sectorNames [sectorLetters[3]] || 'N/A' }}
    Bought from Sector
    - 928 + {{ sectorPurchases[3] || 'N/A' }}
  • - +
    -
    Sector E
    - Lorem ipsum dolor sit amet +
    Sector {{ sectorLetters[4] || 'N/A' }}
    + {{ sectorNames [sectorLetters[4]] || 'N/A' }}
    Bought from Sector
    - 893 + {{ sectorPurchases[4] || 'N/A' }}
  • - +
    -
    Sector F
    - Lorem ipsum dolor sit amet +
    Sector {{ sectorLetters[5] || 'N/A' }}
    + {{ sectorNames [sectorLetters[5]] || 'N/A' }}
    Bought from Sector
    - 121.924 + {{ sectorPurchases[5] || 'N/A' }}
  • - +
    -
    Sector G
    - Lorem ipsum dolor sit amet +
    Sector {{ sectorLetters[6] || 'N/A' }}
    + {{ sectorNames [sectorLetters[6]] || 'N/A' }}
    Bought from Sector
    - 12.125 + {{ sectorPurchases[6] || 'N/A' }}
diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts index f404496..5b84574 100644 --- a/src/app/dashboard/dashboard-customer.component.ts +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -29,6 +29,55 @@ export class DashboardCustomerComponent implements OnInit { week_6: 0, }; + sectorNames = { + A: 'Agriculture, Forestry & Fishing', + B: 'Mining & Quarrying', + C: 'Manufacturing', + D: 'Electricity, Gas, Steam & Air Conditioning', + E: 'Water & Waste Management', + F: 'Construction', + G: 'Wholesale & Retail Trade', + H: 'Transportation & Storage', + I: 'Accomodation & Food Services', + J: 'Information & Communication', + K: 'Financial & Insurance Activities', + L: 'Real Estate', + M: 'Professional, Scientfic & Technical', + N: 'Administrative & Support Services', + O: 'Public Administration, Defence & Social Security', + P: 'Education', + Q: 'Human Health & Social Work', + R: 'Arts, Entertainment & Recreation', + S: 'Other Service Activities', + T: 'Household Domestic Business', + } + + sectorIcons = { + A: 'icon-drop', + B: 'icon-diamond', + C: 'icon-settings', + D: 'icon-energy', + E: 'icon-trash', + F: 'icon-wrench', + G: 'icon-tag', + H: 'icon-speedometer', + I: 'icon-cup', + J: 'icon-globe', + K: 'icon-credit-card', + L: 'icon-graph', + M: 'icon-chemistry', + N: 'icon-drawer', + O: 'icon-pie-chart', + P: 'icon-graduation', + Q: 'icon-support', + R: 'icon-film', + S: 'icon-calendar', + T: 'icon-home', + } + + sectorLetters: string[] = []; + sectorPurchases: number[] = []; + sectorList: any; // Graph widgets @@ -66,8 +115,8 @@ export class DashboardCustomerComponent implements OnInit { ) { this.api.basicStats().subscribe( result => { - this.setWeekPurchaseList(result.data); - + this.setWeekPurchaseList(result.weeks); + this.setSectorList(result.sectors); }, error => { console.log('Retrieval Error'); @@ -92,7 +141,11 @@ export class DashboardCustomerComponent implements OnInit { if (! b) { b = 0 } return Math.max(a,b); }); - console.log(this.maxPurchase); + } + + public setSectorList (data: any) { + this.sectorLetters = Object.values(data.sectors); + this.sectorPurchases = Object.values(data.purchases); } ngOnInit(): void { From 728f9e3d47a22012b67a7847710315f9d34bfb53 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Fri, 15 Dec 2017 17:38:59 +0000 Subject: [PATCH 019/215] fixed es5 compatibility --- src/app/dashboard/dashboard-customer.component.ts | 7 +++---- src/app/panels/pie-panel.component.ts | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts index 5b84574..706db64 100644 --- a/src/app/dashboard/dashboard-customer.component.ts +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -135,8 +135,7 @@ export class DashboardCustomerComponent implements OnInit { week_5: data.purchases[5], week_6: data.purchases[6], }; - //this.maxPurchase = Math.max(...this.weekPurchaseList); - this.maxPurchase = Object.values(this.weekPurchaseList).reduce((a,b) => { + this.maxPurchase = Object.keys(this.weekPurchaseList).map(key => this.weekPurchaseList[key]).reduce((a,b) => { if (! a) { a = 0 } if (! b) { b = 0 } return Math.max(a,b); @@ -144,8 +143,8 @@ export class DashboardCustomerComponent implements OnInit { } public setSectorList (data: any) { - this.sectorLetters = Object.values(data.sectors); - this.sectorPurchases = Object.values(data.purchases); + this.sectorLetters = Object.keys(data.sectors).map(key => data.sectors[key]); + this.sectorPurchases = Object.keys(data.purchases).map(key => data.purchases[key]); } ngOnInit(): void { diff --git a/src/app/panels/pie-panel.component.ts b/src/app/panels/pie-panel.component.ts index 3e8d2ac..bae839f 100644 --- a/src/app/panels/pie-panel.component.ts +++ b/src/app/panels/pie-panel.component.ts @@ -29,7 +29,7 @@ export class PiePanel implements OnInit { } private setData(data: any) { - this.doughnutChartData = Object.values(data); + this.doughnutChartData = Object.keys(data).map(key => data[key]); // setTimeout is currently a workaround for ng2-charts labels setTimeout(() => this.doughnutChartLabels = Object.keys(data), 0); } From 46d99d11f97616f90fb14e2c1a5e1a38f48f5a13 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Fri, 15 Dec 2017 17:44:50 +0000 Subject: [PATCH 020/215] fixed variable definition --- src/app/dashboard/dashboard-customer.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts index 706db64..e781f78 100644 --- a/src/app/dashboard/dashboard-customer.component.ts +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -18,6 +18,7 @@ export class DashboardCustomerComponent implements OnInit { trends: any; myRank: any; username: any; + maxPurchase: number = 0; weekPurchaseList = { week_0: 0, From b50c65ba3dbdb414edf8cd3a012a8e17a2b8ed27 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Fri, 15 Dec 2017 17:59:09 +0000 Subject: [PATCH 021/215] Changelog updated --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5859ba..35748e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ # Next Release * Changed Story Trail choosing to modals +* Revamped snippets and graph widgets on customer dashboard +* Added local purchase pie chart for customer dashboard +* Added week by week purchase list for customer dashboard +* Added sector purchase amount list for customer dashboard # v0.0.7 From b8f5687ac2ab4b8b4457c53a27fc2512e315e22b Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 18 Dec 2017 12:57:40 +0000 Subject: [PATCH 022/215] changed customer dashboard endpoint --- src/app/dashboard/dashboard-customer.component.ts | 2 +- src/app/dashboard/leaderboard.component.html | 4 ++-- src/app/providers/api-service.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts index e781f78..b304d54 100644 --- a/src/app/dashboard/dashboard-customer.component.ts +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -114,7 +114,7 @@ export class DashboardCustomerComponent implements OnInit { constructor( private api: ApiService, ) { - this.api.basicStats().subscribe( + this.api.customerStats().subscribe( result => { this.setWeekPurchaseList(result.weeks); this.setSectorList(result.sectors); diff --git a/src/app/dashboard/leaderboard.component.html b/src/app/dashboard/leaderboard.component.html index 34345f3..c5014ea 100644 --- a/src/app/dashboard/leaderboard.component.html +++ b/src/app/dashboard/leaderboard.component.html @@ -23,8 +23,8 @@ Position - Value - Purchase Time + Name + Amount diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts index 9533acd..131eee3 100644 --- a/src/app/providers/api-service.ts +++ b/src/app/providers/api-service.ts @@ -286,10 +286,10 @@ export class ApiService { } // Basic Customer User stats API - public basicStats() { + public customerStats() { const key = this.sessionKey; return this.http.post( - this.apiUrl + '/stats', + this.apiUrl + '/stats/customer', { session_key : key, } From 13d84905b823eb384096b8be49e6d50a35c903fe Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 18 Dec 2017 16:20:31 +0000 Subject: [PATCH 023/215] added new sector --- CHANGELOG.md | 1 + src/app/auth/register.component.html | 1 + src/app/dashboard/account-edit.component.html | 1 + src/app/dashboard/dashboard-customer.component.ts | 4 +++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35748e4..22b48ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Added local purchase pie chart for customer dashboard * Added week by week purchase list for customer dashboard * Added sector purchase amount list for customer dashboard +* Added sector U to available ones # v0.0.7 diff --git a/src/app/auth/register.component.html b/src/app/auth/register.component.html index 34c50ca..0983b97 100644 --- a/src/app/auth/register.component.html +++ b/src/app/auth/register.component.html @@ -106,6 +106,7 @@ +
diff --git a/src/app/dashboard/account-edit.component.html b/src/app/dashboard/account-edit.component.html index 5d4e7b4..9c6ed5c 100644 --- a/src/app/dashboard/account-edit.component.html +++ b/src/app/dashboard/account-edit.component.html @@ -99,6 +99,7 @@ + Alter this if your business sector has changed.
diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts index b304d54..832fbac 100644 --- a/src/app/dashboard/dashboard-customer.component.ts +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -51,6 +51,7 @@ export class DashboardCustomerComponent implements OnInit { R: 'Arts, Entertainment & Recreation', S: 'Other Service Activities', T: 'Household Domestic Business', + U: 'Extraterritorial Organisations and Bodies' } sectorIcons = { @@ -63,7 +64,7 @@ export class DashboardCustomerComponent implements OnInit { G: 'icon-tag', H: 'icon-speedometer', I: 'icon-cup', - J: 'icon-globe', + J: 'icon-feed', K: 'icon-credit-card', L: 'icon-graph', M: 'icon-chemistry', @@ -74,6 +75,7 @@ export class DashboardCustomerComponent implements OnInit { R: 'icon-film', S: 'icon-calendar', T: 'icon-home', + U: 'cion-globe', } sectorLetters: string[] = []; From f4c9724097b850c431fb10f090e588d5d43b1162 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 18 Dec 2017 17:20:38 +0000 Subject: [PATCH 024/215] added initial looping --- .../dashboard-customer.component.html | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html index 5be3628..3d4b094 100644 --- a/src/app/dashboard/dashboard-customer.component.html +++ b/src/app/dashboard/dashboard-customer.component.html @@ -116,14 +116,26 @@
    -
  • - + +
  • +
    -
    Sector {{ sectorLetters[0] || 'N/A' }}
    -
    {{ sectorNames [sectorLetters[0]] }}
    +
    {{ sectorNames [sector] || 'N/A' }}
    -
    Bought from Sector
    +
    Bought
    + {{ sectorPurchases[i] || 'N/A' }} +
    +
    • + + +
From d8fab7c4dfee35e4658349a99a11ca3675ebedbd Mon Sep 17 00:00:00 2001 From: piratefinn Date: Tue, 19 Dec 2017 18:01:29 +0000 Subject: [PATCH 025/215] frontpage sectors and week stats amended --- .../dashboard-customer.component.html | 144 +++--------------- .../dashboard/dashboard-customer.component.ts | 39 +++-- 2 files changed, 37 insertions(+), 146 deletions(-) diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html index 3d4b094..697c23c 100644 --- a/src/app/dashboard/dashboard-customer.component.html +++ b/src/app/dashboard/dashboard-customer.component.html @@ -19,85 +19,52 @@
-

Purchases Per Week

+

Purchases by Week

  • This Week - {{ (weekPurchaseList.week_0 || 0 ) }} ({{ (weekPurchaseList.week_0 || 0 ) / maxPurchase | percent:'1.0-0' }}) + {{ (weekPurchaseList.first || 0 ) }} + ({{ (weekPurchaseList.first || 0 ) / weekPurchaseList.max | percent:'1.0-0' }})
    + [style.width]="(weekPurchaseList.first || 0 ) / weekPurchaseList.max | percent:'1.0-0'" aria-valuemin="0" aria-valuemax="100">
  • Last Week - {{ weekPurchaseList.week_1 || 0 }} ({{ (weekPurchaseList.week_1 || 0 ) / maxPurchase | percent:'1.0-0' }}) + {{ weekPurchaseList.second || 0 }} + ({{ (weekPurchaseList.second || 0 ) / weekPurchaseList.max | percent:'1.0-0' }})
    + [style.width]="(weekPurchaseList.second || 0 ) / weekPurchaseList.max | percent:'1.0-0'" aria-valuemin="0" aria-valuemax="100">
  • - 2 Weeks Ago - {{ weekPurchaseList.week_2 || 0 }} ({{ (weekPurchaseList.week_2 || 0 ) / maxPurchase | percent:'1.0-0' }}) + Week Maximum + {{ weekPurchaseList.max || 0 }} + (100%)
    + style="width: 100%" aria-valuemin="0" aria-valuemax="100">
  • - 3 Weeks Ago - {{ weekPurchaseList.week_3 || 0 }} ({{ (weekPurchaseList.week_3 || 0 ) / maxPurchase | percent:'1.0-0' }}) + Weekly Average + {{ (weekPurchaseList.sum / weekPurchaseList.count) || 0 | number:'1.0-0'}} + ({{ ((weekPurchaseList.sum / weekPurchaseList.count) || 0) / weekPurchaseList.max | percent:'1.0-0' }})
    -
    -
    -
    • -
  • - 4 Weeks Ago - {{ weekPurchaseList.week_4 || 0 }} ({{ (weekPurchaseList.week_4 || 0 ) / maxPurchase | percent:'1.0-0' }}) -
    -
    -
    -
    -
    -
    • -
  • - 5 Weeks Ago - {{ weekPurchaseList.week_5 || 0 }} ({{ (weekPurchaseList.week_5 || 0 ) / maxPurchase | percent:'1.0-0' }}) -
    -
    -
    -
    -
    -
    • -
  • - 6 Weeks Ago - {{ weekPurchaseList.week_6 || 0 }} ({{ (weekPurchaseList.week_6 || 0 ) / maxPurchase | percent:'1.0-0' }}) -
    -
    -
    + [style.width]="((weekPurchaseList.sum / weekPurchaseList.count) || 0) / weekPurchaseList.max | percent:'1.0-0'" aria-valuemin="0" aria-valuemax="100">
    • @@ -117,7 +84,7 @@
      -
    • +
    • {{ sectorNames [sector] || 'N/A' }}
      @@ -127,84 +94,9 @@ {{ sectorPurchases[i] || 'N/A' }}
      • - - -
    diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts index 832fbac..1d9b145 100644 --- a/src/app/dashboard/dashboard-customer.component.ts +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -20,14 +20,14 @@ export class DashboardCustomerComponent implements OnInit { username: any; maxPurchase: number = 0; + disableSectorButton: boolean = false; + weekPurchaseList = { - week_0: 0, - week_1: 0, - week_2: 0, - week_3: 0, - week_4: 0, - week_5: 0, - week_6: 0, + first: 0, + second: 0, + max: 0, + sum: 0, + count: 0, }; sectorNames = { @@ -75,11 +75,12 @@ export class DashboardCustomerComponent implements OnInit { R: 'icon-film', S: 'icon-calendar', T: 'icon-home', - U: 'cion-globe', + U: 'icon-globe', } sectorLetters: string[] = []; sectorPurchases: number[] = []; + sectorLimit: number = 10; sectorList: any; @@ -130,19 +131,12 @@ export class DashboardCustomerComponent implements OnInit { public setWeekPurchaseList (data: any) { this.weekPurchaseList = { - week_0: data.purchases[0], - week_1: data.purchases[1], - week_2: data.purchases[2], - week_3: data.purchases[3], - week_4: data.purchases[4], - week_5: data.purchases[5], - week_6: data.purchases[6], + first: data.first, + second: data.second, + max: data.max, + sum: data.sum, + count: data.count, }; - this.maxPurchase = Object.keys(this.weekPurchaseList).map(key => this.weekPurchaseList[key]).reduce((a,b) => { - if (! a) { a = 0 } - if (! b) { b = 0 } - return Math.max(a,b); - }); } public setSectorList (data: any) { @@ -150,6 +144,11 @@ export class DashboardCustomerComponent implements OnInit { this.sectorPurchases = Object.keys(data.purchases).map(key => data.purchases[key]); } + public loadMore () { + this.disableSectorButton = true; + this.sectorLimit = 22; + } + ngOnInit(): void { } } From 30919e6eb2397264dc75158e6996d7c7cdc54d92 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 20 Dec 2017 12:32:23 +0000 Subject: [PATCH 026/215] added circles to snippets WARNING: They are a fixed size, therefore will spill content on larger numbers --- .../snippets/cust-snippet-bar.component.html | 18 +++++++++--------- src/scss/_custom.scss | 11 +++++++++++ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/app/snippets/cust-snippet-bar.component.html b/src/app/snippets/cust-snippet-bar.component.html index 80a44ef..9c9647f 100644 --- a/src/app/snippets/cust-snippet-bar.component.html +++ b/src/app/snippets/cust-snippet-bar.component.html @@ -2,25 +2,25 @@
    • -
      My Points
      - {{ userSum / 10 | number:'1.0-0' }} +
      My Points
      +
      {{ userSum / 10 | number:'1.0-0' }}
    • -
      My Rank
      +
      My Rank
      - Unranked +
      Unranked
      - {{ userPosition }} +
      {{ userPosition }}
    • -
      My Total Spend
      - {{ userSum | currency:'GBP':'symbol':'1.2-2' }} +
      My Total Spend
      +
      {{ userSum | currency:'GBP':'symbol':'1.2-2' }}
    • -
      Value to Local Economy
      - {{ userSum * 2.3 | currency:'GBP':'symbol':'1.2-2' }} +
      Value to Local Economy
      +
      {{ userSum * 2.3 | currency:'GBP':'symbol':'1.2-2' }}
    diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index 269a40a..de94c75 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -24,6 +24,17 @@ agm-map { width: 15%; } +// circle for text +.number-circle { + width:24%; + border-radius:50%; + text-align:center; + padding:12% 0; + line-height:0; + position:relative; + background: #20a8d8; + color: white; +} // white title font variant on type-2 as defined in _widgets.css .horizontal-bars { padding: 0; From 2d4a64cef417482de184e50cbae44bd41b819aa8 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 20 Dec 2017 12:33:04 +0000 Subject: [PATCH 027/215] clarified a TODO in css --- src/scss/_custom.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index de94c75..c9858d6 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -25,6 +25,7 @@ agm-map { } // circle for text +// TODO: Make these resize based on inside content .number-circle { width:24%; border-radius:50%; From 2784387b12861fffd28cba1b5c1b2d7dbcb352c8 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 20 Dec 2017 13:41:13 +0000 Subject: [PATCH 028/215] added varying colors based on sector --- .../dashboard-customer.component.html | 2 +- .../dashboard/dashboard-customer.component.ts | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html index 697c23c..ab19c9b 100644 --- a/src/app/dashboard/dashboard-customer.component.html +++ b/src/app/dashboard/dashboard-customer.component.html @@ -85,7 +85,7 @@
    • - +
      {{ sectorNames [sector] || 'N/A' }}
      diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts index 1d9b145..54867f2 100644 --- a/src/app/dashboard/dashboard-customer.component.ts +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -78,6 +78,30 @@ export class DashboardCustomerComponent implements OnInit { U: 'icon-globe', } + sectorClasses = { + A: 'bg-primary', + B: 'bg-success', + C: 'bg-danger', + D: 'bg-warning', + E: 'bg-info', + F: 'bg-primary', + G: 'bg-success', + H: 'bg-danger', + I: 'bg-warning', + J: 'bg-info', + K: 'bg-primary', + L: 'bg-success', + M: 'bg-danger', + N: 'bg-warning', + O: 'bg-info', + P: 'bg-primary', + Q: 'bg-success', + R: 'bg-danger', + S: 'bg-warning', + T: 'bg-info', + U: 'bg-primary', + } + sectorLetters: string[] = []; sectorPurchases: number[] = []; sectorLimit: number = 10; From 95a918076a241596b2e7d509b0187f2e56f796d0 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 20 Dec 2017 16:46:25 +0000 Subject: [PATCH 029/215] snippet circles fixed --- .../snippets/cust-snippet-bar.component.html | 54 +++++++++++-------- src/scss/_custom.scss | 10 ++-- 2 files changed, 38 insertions(+), 26 deletions(-) diff --git a/src/app/snippets/cust-snippet-bar.component.html b/src/app/snippets/cust-snippet-bar.component.html index 9c9647f..968c2f0 100644 --- a/src/app/snippets/cust-snippet-bar.component.html +++ b/src/app/snippets/cust-snippet-bar.component.html @@ -1,27 +1,37 @@ -
      -
      -
        -
      • -
        My Points
        -
        {{ userSum / 10 | number:'1.0-0' }}
        -
        • -
      • -
        My Rank
        -
        -
        Unranked
        +
        +
        +
          +
          +
          +
        • +
          My Points
          +
          {{ userSum / 10 | number:'1.0-0' }}
          +
          • -
          -
          {{ userPosition }}
          +
          +
        • +
          My Rank
          +
          +
          Unranked
          +
          +
          +
          {{ userPosition }}
          +
          +
          • - -
        • -
          My Total Spend
          -
          {{ userSum | currency:'GBP':'symbol':'1.2-2' }}
          -
          • -
        • -
          Value to Local Economy
          -
          {{ userSum * 2.3 | currency:'GBP':'symbol':'1.2-2' }}
          -
          • +
          +
        • +
          My Total Spend
          +
          {{ userSum | currency:'GBP':'symbol':'1.2-2' }}
          +
          • +
          +
          +
        • +
          Value to Local Economy
          +
          {{ userSum * 2.3 | currency:'GBP':'symbol':'1.2-2' }}
          +
          • +
          +
        diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index c9858d6..9efb502 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -27,14 +27,16 @@ agm-map { // circle for text // TODO: Make these resize based on inside content .number-circle { - width:24%; + height: 10rem; border-radius:50%; text-align:center; - padding:12% 0; - line-height:0; - position:relative; + width: 10rem; + padding: 5rem 5%; + line-height: 0; + position: relative; background: #20a8d8; color: white; + font-size: 0.875rem; } // white title font variant on type-2 as defined in _widgets.css .horizontal-bars { From 11fcf170ba2ff679a2aaa6e6cf925b96f91dfddd Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 20 Dec 2017 16:46:57 +0000 Subject: [PATCH 030/215] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22b48ce..9c9218e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * Added week by week purchase list for customer dashboard * Added sector purchase amount list for customer dashboard * Added sector U to available ones +* Fixed snippet layout # v0.0.7 From 057487db4ce1cc49fa536d5e8a83e37f6d0f255a Mon Sep 17 00:00:00 2001 From: piratefinn Date: Thu, 21 Dec 2017 15:31:58 +0000 Subject: [PATCH 031/215] versioning updated --- CHANGELOG.md | 2 ++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c9218e..4fb614e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ # Next Release +# v0.1.0 + * Changed Story Trail choosing to modals * Revamped snippets and graph widgets on customer dashboard * Added local purchase pie chart for customer dashboard diff --git a/package-lock.json b/package-lock.json index d9f03df..4438a01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "localloop-web", - "version": "0.0.7", + "version": "0.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bb4c050..b2811a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "localloop-web", - "version": "0.0.7", + "version": "0.1.0", "description": "LocalLoop Web - Web interface for LocalLoop app", "author": "", "url": "http://www.peartrade.org", From 71eee8f06b5e4b2500b776a7f9dcd2cf9992dbbf Mon Sep 17 00:00:00 2001 From: piratefinn Date: Thu, 21 Dec 2017 17:20:56 +0000 Subject: [PATCH 032/215] updated pie css --- .../dashboard-customer.component.html | 2 +- src/app/panels/pie-panel.component.html | 2 +- .../snippets/cust-snippet-bar.component.html | 52 +++++++++++++------ src/scss/_custom.scss | 7 ++- 4 files changed, 43 insertions(+), 20 deletions(-) diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html index ab19c9b..46310d0 100644 --- a/src/app/dashboard/dashboard-customer.component.html +++ b/src/app/dashboard/dashboard-customer.component.html @@ -78,7 +78,7 @@
        -

        Sector Purchase Amounts

        +

        Purchases by Sector

        diff --git a/src/app/panels/pie-panel.component.html b/src/app/panels/pie-panel.component.html index eb0c194..7e2dd4a 100644 --- a/src/app/panels/pie-panel.component.html +++ b/src/app/panels/pie-panel.component.html @@ -2,7 +2,7 @@
        -

        Local Purchases

        +

        All Purchases

        +
        +
        +
        +
        • -
          My Rank
          +
          My Rank
          Unranked
          @@ -18,20 +24,32 @@
          {{ userPosition }}
        • -
      -
      +
    +
    +
    +
    +
    +
    +
    +
    • -
      My Total Spend
      +
      My Total Spend
      {{ userSum | currency:'GBP':'symbol':'1.2-2' }}
      • -
    -
    + +
    +
    +
    +
    +
    +
    +
    • -
      Value to Local Economy
      +
      Value to Local Economy
      {{ userSum * 2.3 | currency:'GBP':'symbol':'1.2-2' }}
      • -
    +
    - +
    diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index 9efb502..fa409c6 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -34,10 +34,15 @@ agm-map { padding: 5rem 5%; line-height: 0; position: relative; - background: #20a8d8; + background: #4dbd74; color: white; font-size: 0.875rem; } + +.text-dark-green { + color: #10602c; +} + // white title font variant on type-2 as defined in _widgets.css .horizontal-bars { padding: 0; From c7020f4283f5bd5b3196fe6d53d6504db0c65dbe Mon Sep 17 00:00:00 2001 From: piratefinn Date: Thu, 21 Dec 2017 17:27:14 +0000 Subject: [PATCH 033/215] changelog and versioning updated --- CHANGELOG.md | 5 +++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fb614e..7923872 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ # Next Release +# v0.1.1 + +* Redid layout on circle customer view +* Renamed customer dashboard headers + # v0.1.0 * Changed Story Trail choosing to modals diff --git a/package-lock.json b/package-lock.json index 4438a01..2e529ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "localloop-web", - "version": "0.1.0", + "version": "0.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b2811a6..6b3ee33 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "localloop-web", - "version": "0.1.0", + "version": "0.1.1", "description": "LocalLoop Web - Web interface for LocalLoop app", "author": "", "url": "http://www.peartrade.org", From e64b6057e8aeb14da17d0e940e3448452242479e Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 15 Jan 2018 14:19:16 +0000 Subject: [PATCH 034/215] added category list endpoint --- src/app/providers/api-service.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts index 131eee3..25e9ce1 100644 --- a/src/app/providers/api-service.ts +++ b/src/app/providers/api-service.ts @@ -116,6 +116,17 @@ export class ApiService { ); } + // Basic Customer User stats API + public categoryList() { + const key = this.sessionKey; + return this.http.post( + this.apiUrl + '/search/category', + { + session_key : key, + } + ); + } + // Searches organisations used for transaction submission public search(data) { From 59efe7a65055aa005e12cd1be0a007e0813224c8 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 15 Jan 2018 15:33:38 +0000 Subject: [PATCH 035/215] Retrieving categories from API --- src/app/dashboard/add-data.component.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/app/dashboard/add-data.component.ts b/src/app/dashboard/add-data.component.ts index ffa4ef8..7ca6cd1 100644 --- a/src/app/dashboard/add-data.component.ts +++ b/src/app/dashboard/add-data.component.ts @@ -37,6 +37,8 @@ export class AddDataComponent implements OnInit { transactionFormInvalid = true; myDate: any; minDate: any; + categoryIds: number[] = []; + categoryNames: string[] = []; constructor( private formBuilder: FormBuilder, @@ -64,6 +66,16 @@ export class AddDataComponent implements OnInit { }); this.myDate = moment().format('YYYY-MM-DD[T]HH:mm'); // this.myDate = new Date().toISOString().slice(0, 16); + this.api.categoryList().subscribe( + result => { + this.categories = result; + console.log(this.categories); + }, + error => { + console.log('Retrieval Error'); + console.log( error._body ); + } + ); } ngOnInit(): void { From d17a686490571a57c498b255928f058e73dd8414 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 15 Jan 2018 16:20:51 +0000 Subject: [PATCH 036/215] functional receiving, choosing and upload of transaction category --- src/app/dashboard/add-data.component.html | 14 ++++++++++++++ src/app/dashboard/add-data.component.ts | 15 +++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html index 948f868..ebdea7a 100644 --- a/src/app/dashboard/add-data.component.html +++ b/src/app/dashboard/add-data.component.html @@ -24,6 +24,20 @@ Enter the amount spent, such as 5.35 for £5.35.
    +
    + +
    +
    + +
    + Optional: Choose the relevant Category for the purchase. +
    +
    diff --git a/src/app/dashboard/add-data.component.ts b/src/app/dashboard/add-data.component.ts index 7ca6cd1..f970448 100644 --- a/src/app/dashboard/add-data.component.ts +++ b/src/app/dashboard/add-data.component.ts @@ -30,6 +30,7 @@ export class AddDataComponent implements OnInit { organisationTown: string; organisationPostcode: string; amount: number; + categoryId: number; transactionAdditionType = 1; storeList = []; showAddStore = false; @@ -37,8 +38,8 @@ export class AddDataComponent implements OnInit { transactionFormInvalid = true; myDate: any; minDate: any; - categoryIds: number[] = []; - categoryNames: string[] = []; + categoryIdList: number[] = []; + categoryNameList: string[] = []; constructor( private formBuilder: FormBuilder, @@ -70,6 +71,7 @@ export class AddDataComponent implements OnInit { result => { this.categories = result; console.log(this.categories); + this.setCategoryList(result.categories); }, error => { console.log('Retrieval Error'); @@ -83,6 +85,11 @@ export class AddDataComponent implements OnInit { this.accountType = localStorage.getItem('usertype'); } + private setCategoryList(data: any) { + this.categoryIdList = Object.keys(data.ids).map(key => data.ids[key]); + this.categoryNameList = Object.keys(data.names).map(key => data.names[key]); + } + getMinDate() { // gets the April 1st date of the current year const aprilDate = moment().month(3).date(1); @@ -182,6 +189,7 @@ export class AddDataComponent implements OnInit { transaction_value : this.amount, purchase_time : purchaseTime, organisation_id : this.organisationId, + category : this.categoryId, }; break; case 2: @@ -190,6 +198,7 @@ export class AddDataComponent implements OnInit { transaction_value : this.amount, purchase_time : purchaseTime, organisation_id : this.organisationId, + category : this.categoryId, }; break; case 3: @@ -201,6 +210,7 @@ export class AddDataComponent implements OnInit { street_name : this.submitOrg.street_name, town : this.submitOrg.town, postcode : this.submitOrg.postcode, + category : this.categoryId, }; break; } @@ -251,6 +261,7 @@ export class AddDataComponent implements OnInit { this.amount = null; this.transactionFormInvalid = true; this.showAddStore = false; + this.categoryId = null; } onSubmitPayroll() { From 511969656e6c74e4eac11657d8091d85b846c50e Mon Sep 17 00:00:00 2001 From: piratefinn Date: Tue, 16 Jan 2018 15:57:38 +0000 Subject: [PATCH 037/215] Fixed app, added ability for non category transaction changed reset form --- src/app/dashboard/add-data.component.html | 2 +- src/app/dashboard/add-data.component.ts | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html index ebdea7a..edcb5e2 100644 --- a/src/app/dashboard/add-data.component.html +++ b/src/app/dashboard/add-data.component.html @@ -29,7 +29,7 @@
    Week - -
    -
    -
    Date: Wed, 17 Jan 2018 15:02:53 +0000 Subject: [PATCH 040/215] added just in case for font loading file attribute --- .gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitattributes b/.gitattributes index bdb0cab..60dd516 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,3 +15,9 @@ *.PDF diff=astextplain *.rtf diff=astextplain *.RTF diff=astextplain + +# ensures font files are loaded as binary not text +*.ttf binary +*.eot binary +*.woff binary +*.woff2 binary From 45eb7cb7a11860aee7b3469ffc825ce634a67c11 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 17 Jan 2018 17:36:28 +0000 Subject: [PATCH 041/215] added new category transaction listing page --- .../dashboard/category-month.component.html | 33 +++++++++++++++ src/app/dashboard/category-month.component.ts | 40 +++++++++++++++++++ src/app/dashboard/dashboard.module.ts | 2 + src/app/dashboard/dashboard.routing.ts | 6 +++ src/app/layouts/full-layout.component.html | 8 ++++ src/app/providers/api-service.ts | 11 +++++ 6 files changed, 100 insertions(+) create mode 100644 src/app/dashboard/category-month.component.html create mode 100644 src/app/dashboard/category-month.component.ts diff --git a/src/app/dashboard/category-month.component.html b/src/app/dashboard/category-month.component.html new file mode 100644 index 0000000..a1f0b30 --- /dev/null +++ b/src/app/dashboard/category-month.component.html @@ -0,0 +1,33 @@ +
    +
    +
    +
    +
    +
    +
    +

    Purchases this week

    +
    +
    +
    +
      +
    • + Placeholder Category + {{ (weekPurchaseList.first || 0 ) }} + ({{ (weekPurchaseList.first || 0 ) / weekPurchaseList.max | percent:'1.0-0' }}) +
      +
      +
      +
      +
      +
      • +
    • + +
      • +
    +
    +
    +
    +
    +
    +
    diff --git a/src/app/dashboard/category-month.component.ts b/src/app/dashboard/category-month.component.ts new file mode 100644 index 0000000..cf83e6d --- /dev/null +++ b/src/app/dashboard/category-month.component.ts @@ -0,0 +1,40 @@ +import { Directive, Component, OnInit } from '@angular/core'; +import { ApiService } from '../providers/api-service'; +import { DataType } from '../shared/data-types.enum'; + +@Component({ + templateUrl: 'category-month.component.html' +}) +export class CategoryMonthComponent implements OnInit { + + disableCategoryButtonFirst: boolean = false; + + weekPurchaseList = { + first: 0, + }; + + categoryList: number[] = []; + categoryLimitFirst: number = 10; + + constructor( + private api: ApiService, + ) { + this.api.categoryTransactionList().subscribe( + result => { + console.log(result); + }, + error => { + console.log('Retrieval Error'); + console.log( error._body ); + } + ); + } + + public loadMore () { + this.disableCategoryButtonFirst = true; + this.categoryLimitFirst = 100; + } + + ngOnInit(): void { + } +} diff --git a/src/app/dashboard/dashboard.module.ts b/src/app/dashboard/dashboard.module.ts index d6fcfca..2e47f80 100644 --- a/src/app/dashboard/dashboard.module.ts +++ b/src/app/dashboard/dashboard.module.ts @@ -16,6 +16,7 @@ import { AccountEditComponent } from './account-edit.component'; import { AddDataComponent } from './add-data.component'; import { FeedbackComponent } from './feedback.component'; import { TransactionLogComponent } from './transaction-log.component'; +import { CategoryMonthComponent } from './category-month.component'; import { PayrollLogComponent } from './payroll-log.component'; import { LeaderboardComponent } from './leaderboard.component'; import { MapComponent } from './map.component'; @@ -61,6 +62,7 @@ import { environment } from '../../environments/environment'; OrgResultComponent, OrgTableComponent, TransactionLogComponent, + CategoryMonthComponent, TransactionResultComponent, PayrollLogComponent, PayrollResultComponent, diff --git a/src/app/dashboard/dashboard.routing.ts b/src/app/dashboard/dashboard.routing.ts index 46b9df3..90cb277 100644 --- a/src/app/dashboard/dashboard.routing.ts +++ b/src/app/dashboard/dashboard.routing.ts @@ -12,6 +12,7 @@ import { AccountEditComponent } from './account-edit.component'; import { AddDataComponent } from './add-data.component'; import { FeedbackComponent } from './feedback.component'; import { TransactionLogComponent } from './transaction-log.component'; +import { CategoryMonthComponent } from './category-month.component'; import { PayrollLogComponent } from './payroll-log.component'; import { LeaderboardComponent } from './leaderboard.component'; import { MapComponent } from './map.component'; @@ -58,6 +59,11 @@ const routes: Routes = [ component: TransactionLogComponent, data: { title: 'Transaction Log' }, }, + { + path: 'category-month', + component: CategoryMonthComponent, + data: { title: 'Month Category' }, + }, { path: 'map', component: MapComponent, diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 8a205f9..40d7c98 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -81,6 +81,14 @@
    +
  • + +
    +
    +
    Month Category
    +
    +     +
  • diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts index 25e9ce1..bbf3464 100644 --- a/src/app/providers/api-service.ts +++ b/src/app/providers/api-service.ts @@ -127,6 +127,17 @@ export class ApiService { ); } + // Basic Customer User stats API + public categoryTransactionList() { + const key = this.sessionKey; + return this.http.post( + this.apiUrl + '/stats/category', + { + session_key : key, + } + ); + } + // Searches organisations used for transaction submission public search(data) { From 004c30cc28b05b4cdb8c91bd0d78ac7fd60c67a3 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Thu, 18 Jan 2018 12:16:37 +0000 Subject: [PATCH 042/215] Changed transaction category input --- src/app/dashboard/add-data.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html index edcb5e2..f43870e 100644 --- a/src/app/dashboard/add-data.component.html +++ b/src/app/dashboard/add-data.component.html @@ -28,7 +28,7 @@
    -
    Date: Wed, 17 Jan 2018 15:02:53 +0000 Subject: [PATCH 044/215] added just in case for font loading file attribute --- .gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitattributes b/.gitattributes index bdb0cab..60dd516 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,3 +15,9 @@ *.PDF diff=astextplain *.rtf diff=astextplain *.RTF diff=astextplain + +# ensures font files are loaded as binary not text +*.ttf binary +*.eot binary +*.woff binary +*.woff2 binary From a20d94d9cbf9c0fd6059dccc7aa673e05ae6e4c0 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Thu, 18 Jan 2018 12:16:37 +0000 Subject: [PATCH 045/215] Changed transaction category input --- src/app/dashboard/add-data.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html index edcb5e2..f43870e 100644 --- a/src/app/dashboard/add-data.component.html +++ b/src/app/dashboard/add-data.component.html @@ -28,7 +28,7 @@
    -
    • -
  • +
    • @@ -53,7 +53,7 @@
    -
  • +
    • @@ -84,7 +84,7 @@
    -
  • +
    • @@ -115,7 +115,7 @@
    -
  • +
    • diff --git a/src/app/dashboard/category-month.component.ts b/src/app/dashboard/category-month.component.ts index 40fbbdb..1e20a3e 100644 --- a/src/app/dashboard/category-month.component.ts +++ b/src/app/dashboard/category-month.component.ts @@ -18,10 +18,10 @@ export class CategoryMonthComponent implements OnInit { first: 0, }; - weekList1 = {}; - weekList2 = {}; - weekList3 = {}; - weekList4 = {}; + weekList1 = []; + weekList2 = []; + weekList3 = []; + weekList4 = []; categoryList: number[] = []; dayList: any[] = []; @@ -32,7 +32,7 @@ export class CategoryMonthComponent implements OnInit { myWeek4: any; categoryIdList: number[] = []; categoryNameList: string[] = []; - categoryLimit1: number = 6; + categoryLimit1: number = 2; categoryLimit2: number = 6; categoryLimit3: number = 6; categoryLimit4: number = 6; diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html index 46310d0..e8019a4 100644 --- a/src/app/dashboard/dashboard-customer.component.html +++ b/src/app/dashboard/dashboard-customer.component.html @@ -94,7 +94,7 @@ {{ sectorPurchases[i] || 'N/A' }} -
  • +
    • From d674c5b59be18650300af9c4abae45a2ec098680 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Wed, 24 Jan 2018 13:18:51 +0000 Subject: [PATCH 053/215] list fully finished --- .../dashboard/category-month.component.html | 30 ++++++++--------- src/app/dashboard/category-month.component.ts | 33 ++++++++++++++----- src/app/dashboard/dashboard.routing.ts | 2 +- src/app/layouts/full-layout.component.html | 2 +- 4 files changed, 41 insertions(+), 26 deletions(-) diff --git a/src/app/dashboard/category-month.component.html b/src/app/dashboard/category-month.component.html index ac5ba47..5b5434d 100644 --- a/src/app/dashboard/category-month.component.html +++ b/src/app/dashboard/category-month.component.html @@ -12,12 +12,12 @@     diff --git a/src/app/layouts/full-layout.component.ts b/src/app/layouts/full-layout.component.ts index 453a8df..ff74ceb 100644 --- a/src/app/layouts/full-layout.component.ts +++ b/src/app/layouts/full-layout.component.ts @@ -39,7 +39,6 @@ export class FullLayoutComponent implements OnInit { .logout() .subscribe( result => { - console.log('Logged out!'); localStorage.clear(); this.router.navigate(['/login']); } diff --git a/src/app/panels/pie-panel.component.ts b/src/app/panels/pie-panel.component.ts index 3b8b39c..80f64e1 100644 --- a/src/app/panels/pie-panel.component.ts +++ b/src/app/panels/pie-panel.component.ts @@ -3,7 +3,6 @@ import { ApiService } from '../providers/api-service'; import { CustPiesService } from '../providers/cust-pies.service'; import { DataType } from '../shared/data-types.enum'; import { ChartData } from '../_interfaces/chart-data'; -import * as moment from 'moment'; import 'rxjs/add/operator/map'; @Component({ From 3d5d20e41964e94d178f917a5b7795b08b7ea77a Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 16 Apr 2018 14:52:19 +0100 Subject: [PATCH 099/215] Added hint for closing menu --- src/app/layouts/full-layout.component.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 13887c7..baf33dd 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -25,6 +25,13 @@
    From daff33657f7d7be8620e93f217b3ad7157bdf95b Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 16 Apr 2018 15:08:23 +0100 Subject: [PATCH 100/215] Fixed instruction for close menu button --- src/app/layouts/full-layout.component.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index baf33dd..58baf2c 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -26,10 +26,8 @@