From 580f152c03e552d4568b024aeeb7f2c8d5209c7a Mon Sep 17 00:00:00 2001
From: Isahann Hanacleto <isahanacleto@gmail.com>
Date: Mon, 7 Aug 2023 11:55:44 -0300
Subject: [PATCH] #14 adding point specification

---
 src/app/app-routing.module.ts                 |  4 +--
 .../correct-answer-window.component.sass      |  3 +--
 .../correct-answer-window.component.ts        |  6 +++--
 .../question-window.component.html            |  1 +
 .../question-window.component.sass            |  4 +++
 .../question-window.component.ts              | 25 ++++++++++++++++---
 src/model/PathsEnum.ts                        |  3 +--
 7 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index e63830c..e9675d9 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -31,11 +31,11 @@ const routes: Routes = [
       component: QuestionWindowComponent,
     },
     {
-      path: PathsEnum.CORRECT_ANSWER,
+      path: `${PathsEnum.CORRECT_ANSWER}/:points`,
       component: CorrectAnswerWindowComponent,
     },
     {
-      path: PathsEnum.WRONG_ANSWER,
+      path: `${PathsEnum.WRONG_ANSWER}/:answer`,
       component: WrongAnswerWindowComponent
     }
   ]
diff --git a/src/app/correct-answer-window/correct-answer-window.component.sass b/src/app/correct-answer-window/correct-answer-window.component.sass
index a30ccbd..5ed149c 100644
--- a/src/app/correct-answer-window/correct-answer-window.component.sass
+++ b/src/app/correct-answer-window/correct-answer-window.component.sass
@@ -13,5 +13,4 @@
 
     label
       text-align: center
-
-
+      margin: 5px
diff --git a/src/app/correct-answer-window/correct-answer-window.component.ts b/src/app/correct-answer-window/correct-answer-window.component.ts
index 1f91843..52f4691 100644
--- a/src/app/correct-answer-window/correct-answer-window.component.ts
+++ b/src/app/correct-answer-window/correct-answer-window.component.ts
@@ -1,5 +1,5 @@
 import {Component, OnInit} from '@angular/core';
-import {Router} from "@angular/router";
+import {ActivatedRoute, Router} from "@angular/router";
 import {PathsEnum} from "../../model/PathsEnum";
 import {StorageService} from "../../service/storage.service";
 import {AppStorage} from "../../model/AppStorage";
@@ -11,14 +11,16 @@ import {AppStorage} from "../../model/AppStorage";
 })
 export class CorrectAnswerWindowComponent implements OnInit {
 
-  public questionScore: number = 10;
+  public questionScore: number = 0;
 
   private correctAnswerSound: HTMLAudioElement = new Audio('assets/sounds/tada.wav');
 
   constructor(
     private readonly router: Router,
+    private readonly route: ActivatedRoute,
     private readonly storageService: StorageService
   ) {
+    this.questionScore = parseInt(this.route.snapshot.paramMap.get('points') ?? '0');
   }
 
   public async ngOnInit(): Promise<void> {
diff --git a/src/app/question-window/question-window.component.html b/src/app/question-window/question-window.component.html
index 5a0b515..2d4104e 100644
--- a/src/app/question-window/question-window.component.html
+++ b/src/app/question-window/question-window.component.html
@@ -12,6 +12,7 @@
       <ng-container *ngIf="this.questionLoaded">
         <div class="window_question_body_loaded">
           <label class="window_question_body_loaded_title">{{this.question}}</label>
+          <label class="window_question_body_loaded_points">[{{this.questionPoints}} point(s) for this question]</label>
           <div class="window_question_body_loaded_list">
             <ng-container *ngFor="let answer of this.answers">
               <button [disabled]="this.selectedAnswer"
diff --git a/src/app/question-window/question-window.component.sass b/src/app/question-window/question-window.component.sass
index f15d21e..8fd8c53 100644
--- a/src/app/question-window/question-window.component.sass
+++ b/src/app/question-window/question-window.component.sass
@@ -33,6 +33,10 @@
             font-weight: bold
             max-width: 250px
 
+          &_points
+            font-style: italic
+            margin: 0px 5px 5px 5px
+
           &_list
             display: flex
             flex-direction: column
diff --git a/src/app/question-window/question-window.component.ts b/src/app/question-window/question-window.component.ts
index 7fe4e86..aa41095 100644
--- a/src/app/question-window/question-window.component.ts
+++ b/src/app/question-window/question-window.component.ts
@@ -13,6 +13,7 @@ export class QuestionWindowComponent implements OnInit {
 
   public questionLoaded: boolean = false;
   public question: string = '';
+  public questionPoints: number = 0;
   public answers: string[] = [];
   public selectedAnswer: string = '';
   public confirmedAnswer: boolean = false;
@@ -24,7 +25,6 @@ export class QuestionWindowComponent implements OnInit {
   private confirmAnswerSound: HTMLAudioElement = new Audio('assets/sounds/exclamation.wav');
   private correctAnswer: string = '';
 
-
   constructor(
     private readonly triviaService: TriviaService,
     private readonly router: Router
@@ -63,6 +63,8 @@ export class QuestionWindowComponent implements OnInit {
       this.questionLoaded = true;
 
       await this.questionReadySound.play();
+
+      this.questionPoints = this.sumQuestionPoints(singleQuiz.difficulty, singleQuiz.isNiche);
     });
   }
 
@@ -87,10 +89,25 @@ export class QuestionWindowComponent implements OnInit {
 
   private async redirectFromAnswer(): Promise<void> {
     const correctAnswer: boolean = this.selectedAnswer === this.correctAnswer;
-    const routeToNavigate: string = correctAnswer ? PathsEnum.CORRECT_ANSWER : PathsEnum.WRONG_ANSWER_NO_PARAM;
-    const answer: string | null = correctAnswer ? null : this.correctAnswer;
 
-    await this.router.navigate(answer === null ? [routeToNavigate] : [routeToNavigate, answer]);
+    if (correctAnswer) {
+      await this.router.navigate([PathsEnum.CORRECT_ANSWER, this.questionPoints]);
+    } else {
+      await this.router.navigate([PathsEnum.WRONG_ANSWER, this.correctAnswer]);
+    }
+  }
+
+  private sumQuestionPoints(questionDifficulty: string, isNiche: boolean): number {
+    const difficultyPointsMap: Map<string, number> = new Map<string, number>([
+      ['easy', 1],
+      ['medium', 3],
+      ['hard', 5]
+    ]);
+
+    const questionPoints: number = difficultyPointsMap.get(questionDifficulty)!;
+    const nichePoints: number = isNiche ? 10 : 0;
+
+    return questionPoints + nichePoints;
   }
 
   private startLoadingProgressBar(): void {
diff --git a/src/model/PathsEnum.ts b/src/model/PathsEnum.ts
index d0b6430..b642f28 100644
--- a/src/model/PathsEnum.ts
+++ b/src/model/PathsEnum.ts
@@ -4,6 +4,5 @@ export enum PathsEnum {
   ABOUT = 'about',
   QUIZ = 'quiz',
   CORRECT_ANSWER = 'correct-answer',
-  WRONG_ANSWER = 'wrong-answer/:answer',
-  WRONG_ANSWER_NO_PARAM = 'wrong-answer'
+  WRONG_ANSWER = 'wrong-answer',
 }