From 8f725b93af52b447f61c75c7ed83f28456199986 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 13 Nov 2017 12:26:24 +0000 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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 @@
    @ - +