Updated ResultsComponent

Removed Name Input Field and Validator
cstodor · Apr 15, 2017 · 3cde35a · 3cde35a
1 parent a528d7e
commit 3cde35a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/ng-src/src/app/components/quiz/results/results.component.html b/ng-src/src/app/components/quiz/results/results.component.html
@@ -2,12 +2,8 @@
   <div>{{ quizScore }}%</div>
 </div>
 <div class="register-score">
-  <form (submit)="registerScore()">
-    <p>Enter your name to register score:</p>
-    <label for="name" class="hidden">Name</label>
-    <input type="text" [(ngModel)]="name" class="name" name="name" placeholder="Enter Your Name">
-    <button class="btn-register">Register Score</button>
-  </form>
+  <p>Register Your Score?</p>
+  <button (click)="registerScore()" class="btn-register">Yes, Register!</button>
 </div>
 <div>
   <button class="btn-home btn-primary" routerLink="/">BACK TO HOME</button>

diff --git a/ng-src/src/app/components/quiz/results/results.component.ts b/ng-src/src/app/components/quiz/results/results.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, Output, EventEmitter, OnDestroy } from '@angular/cor
 import { Router } from '@angular/router';
 // Service
 import { QuizService } from '../quiz.service';
+import { Auth } from "../../auth/auth.service";
 
 @Component({
   selector: 'app-results',
@@ -12,32 +13,29 @@ export class ResultsComponent implements OnInit {
 
   quizScore: number = null;
   @Output() scoreSend = new EventEmitter<number>();
-  name: String;
+  profile: any;
 
   constructor(
-    private _quizService: QuizService,
-    private router: Router) { }
+    public _quizService: QuizService,
+    public router: Router,
+    public auth: Auth
+  ) { }
 
   ngOnInit() {
     // Get Current Score
     this.quizScore = this._quizService.score;
+    this.profile = JSON.parse(localStorage.getItem('profile'));
   }
 
   registerScore() {
 
     // result object
     const result = {
-      name: this.name,
+      name: this.profile.given_name,
       score: this.quizScore,
       date: new Date()
     }
 
-    // Name is required!
-    if (!this._quizService.validateName(result)) {
-      console.log('Please enter your name!');
-      return false;
-    }
-
     // result object registration 
     this._quizService.registerResult(result).subscribe(data => {
       if (data.success) {
@@ -50,10 +48,9 @@ export class ResultsComponent implements OnInit {
       });
   }
 
-
   // Send Score to Quiz Component (parent)
   sendScore() {
-    console.log("sendScore()")
+    console.log("sendScore()");
     this.scoreSend.emit(this.quizScore);
   }
 
@@ -63,5 +60,4 @@ export class ResultsComponent implements OnInit {
     this._quizService.quizDone(false);
   }
 
-
 }