Merge pull request #439 from sinfo/my-card-fix

Fix my card error and rename 'My card' to 'My Activity'

Author: andreromao

src/app/user/my-card/my-card.component.html

@@ -3,7 +3,7 @@
 <div class="wrapper pad" *ngIf="signatures && signatures.companies">
   <div class="row">
     <h3 class="title">
-      {{signatures.day | date:'EEEE':'+0100'}}'s card
+      {{signatures.day | date:'EEEE':'+0100'}}'s Activity
     </h3>
     <h6 *ngIf="userSignatures && userSignatures.redeemed" class="title">
       Already redeemed your prize.
@@ -16,10 +16,10 @@ <h5 [ngClass]="{allSignatures: numSignatures === signatures.capacity}">
         <i *ngIf="numSignatures === signatures.capacity" class="fa fa-check"></i>
       </h5>
     </div>
-    <div class="alert alert-info promocode-info" *ngIf="!userSignatures.redeemed">
+    <div class="alert alert-info promocode-info" *ngIf="!userSignatures || !userSignatures.redeemed">
       <b>Earn prizes</b>
-      <span *ngIf="!numSignatures || numSignatures < signatures.capacity">: Visit 10 companies and get the chance to spin the wheel of fortune at SINFO stand.</span>
-      <span *ngIf="numSignatures === signatures.capacity"><b> now:</b> You can now spin the wheel of fortune at SINFO stand.</span>
+      <span *ngIf="!numSignatures || numSignatures < signatures.capacity">: Visit 10 companies and get the chance to spin the wheel of fortune at the frontdesk.</span>
+      <span *ngIf="numSignatures === signatures.capacity"><b> now:</b> You can now spin the wheel of fortune at the frontdesk.</span>
     </div>
   </div>
   <div class="row">

src/app/user/user.component.html

@@ -255,8 +255,8 @@ <h2 *ngIf="user && user.role === 'team'" matSubheader style="color: grey;">Atend
       <a *ngIf="user && user.role !== 'company'" mat-list-item routerLink="/user/my-card"
         routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
         <div class="navigation-link">
-          <mat-icon>school</mat-icon>
-          <span class="list-item">My card</span>
+          <mat-icon>timelapse</mat-icon>
+          <span class="list-item">My Activity</span>
         </div>
       </a>
       <!-- <a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/secret-codes" routerLinkActive="navigation-link active"