Updating angular, fixing anonymous issues. Fixes #31. Fixes #32.

dessalines · Dec 14, 2017 · 51a5033 · 51a5033
1 parent 05c5a58
commit 51a5033
Show file tree

Hide file tree

Showing 3 changed files with 189 additions and 213 deletions.
diff --git a/ui/package.json b/ui/package.json
@@ -12,29 +12,29 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "^4.0.0",
-    "@angular/compiler": "^4.0.0",
-    "@angular/core": "^4.0.0",
-    "@angular/forms": "^4.0.0",
-    "@angular/http": "^4.0.0",
-    "@angular/platform-browser": "^4.0.0",
-    "@angular/platform-browser-dynamic": "^4.0.0",
-    "@angular/router": "^4.0.0",
+    "@angular/common": "^5.1.0",
+    "@angular/compiler": "^5.1.0",
+    "@angular/core": "^5.1.0",
+    "@angular/forms": "^5.1.0",
+    "@angular/http": "^5.1.0",
+    "@angular/platform-browser": "^5.1.0",
+    "@angular/platform-browser-dynamic": "^5.1.0",
+    "@angular/router": "^5.1.0",
     "angular2-jwt": "^0.2.2",
     "bootswatch": "^4.0.0-beta.2",
     "moment": "^2.19.1",
     "core-js": "^2.4.1",
     "font-awesome": "^4.7.0",
     "hashids": "^1.1.1",
     "markdown-it": "^8.3.1",
-    "ngx-bootstrap": "^1.6.6",
+    "ngx-bootstrap": "^2.0.0-beta.11",
     "randomcolor": "^0.5.3",
-    "rxjs": "^5.4.2",
+    "rxjs": "^5.5.0",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@angular/cli": "^1.5.5",
-    "@angular/compiler-cli": "^4.0.0",
+    "@angular/cli": "^1.6.1",
+    "@angular/compiler-cli": "^5.1.0",
     "@types/jasmine": "2.5.38",
     "@types/node": "~6.0.60",
     "codelyzer": "~2.0.0",
@@ -46,9 +46,9 @@
     "karma-coverage-istanbul-reporter": "^0.2.0",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.1.0",
+    "protractor": "~4.0.0",
     "ts-node": "~2.0.0",
     "tslint": "~4.5.0",
-    "typescript": "2.3.4"
+    "typescript": "2.4.2"
   }
 }
diff --git a/ui/src/app/components/candidate/candidate.component.html b/ui/src/app/components/candidate/candidate.component.html
@@ -70,11 +70,11 @@
       </thead>
       <tr *ngFor="let vote of candidate.votes">
         <td>
-          <b *ngIf="!anonymous || vote.editable">{{vote.user.name}}</b>
-          <b *ngIf="anonymous && !vote.editable">???</b>
+          <b>{{vote.user.name}}</b>
         </td>
         <td>
-          <span>{{vote.vote / 10}}</span>
+          <span *ngIf="!anonymous || vote.editable">{{vote.vote / 10}}</span>
+          <span *ngIf="anonymous && !vote.editable">???</span>
           <i *ngIf="vote.editable" tooltip="Clear vote" (click)="deleteOtherVote(vote)" role="button" class="fa fa-fw fa-times"></i>
         </td>
       </tr>