Merge pull request #28 from Pear-Trading/finn/leaderboardfix

Fixes made

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

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', () => {

src/app/auth/login.component.html

@@ -10,7 +10,7 @@
                 <form [formGroup]="signin" (ngSubmit)="onSubmit()">
                   <div class="input-group mb-3">
                     <span class="input-group-addon">@</span>
-                    <input id="username" type="text" class="form-control" formControlName="email" placeholder="Email">
+                    <input id="username" type="email" class="form-control" formControlName="email" placeholder="Email">
                   </div>
                   <div class="input-group mb-4">
                     <span class="input-group-addon"><i class="icon-lock"></i></span>

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;

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' },
+        data: { title: 'Purchase Map' },
-        canActivate: [OrgGuard],
       },
       {
         path: 'payroll-log',

src/app/dashboard/map.component.html

@@ -3,7 +3,7 @@
     <div class="col-lg-12">
       <div class="card">
         <div class="card-header">
-          <strong>Supplier Map</strong>
+          <strong>Purchase Map</strong>
           <small>Required Data marked in <strong>bold</strong>.</small>
         </div>
         <div [ngSwitch]="dataReceived">

src/app/layouts/full-layout.component.html

@@ -40,12 +40,12 @@
             <i class="icon-envelope-letter"></i> Enter Feedback
           </a>
         </li>
-        <li  *ngIf="accountType == 'customer'" class="nav-item">
+        <li class="nav-item">
           <a class="nav-link" routerLinkActive="active" [routerLink]="['/map']">
-            <i class="icon-map"></i> Supplier Map
+            <i class="icon-map"></i> Purchase Map
           </a>
         </li>
-        <li class="nav-item">
+        <li *ngIf="accountType == 'customer'" class="nav-item">
           <a class="nav-link" routerLinkActive="active" [routerLink]="['/leaderboard']">
             <i class="icon-basket"></i> Leaderboard
           </a>