From 6f8b7368b1cd990eda7d27806a3e2576abe5676f Mon Sep 17 00:00:00 2001
From: sondrefj <sonax@computas.com>
Date: Wed, 24 Jul 2024 13:43:59 +0200
Subject: [PATCH] refactor: remove unused styling, logic and variables

---
 .../game-drawing-display.component.scss            |  2 +-
 .../game-drawing-display.component.ts              |  9 ++++++---
 .../game-drawing-feedback.component.html           |  2 +-
 .../game-drawing-feedback.component.ts             |  3 ++-
 .../correct-guess/correct-guess.component.ts       |  4 ++--
 .../wrong-guess/wrong-guess.component.scss         |  4 ----
 .../game-intermediate-result-footer.component.scss | 14 +++-----------
 .../game-intermediate-result-footer.component.ts   |  2 +-
 .../confirm-exit-dialog.component.html             |  2 +-
 .../confirm-exit-dialog.component.ts               |  5 ++++-
 .../game-progress-bar.component.ts                 |  1 -
 .../game-intermediate-result.component.html        |  9 ++-------
 .../game-intermediate-result.component.ts          |  5 -----
 13 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/src/app/game/game-intermediate-result/game-drawing-display/game-drawing-display.component.scss b/src/app/game/game-intermediate-result/game-drawing-display/game-drawing-display.component.scss
index 09625927..187ff83d 100644
--- a/src/app/game/game-intermediate-result/game-drawing-display/game-drawing-display.component.scss
+++ b/src/app/game/game-intermediate-result/game-drawing-display/game-drawing-display.component.scss
@@ -9,7 +9,7 @@
 
 .user-drawing-board {
   border-radius: 0.6em;
-  padding: 0.4em; // this is what controls the width of the border
+  padding: 0.4em; // controls the width of the border
   background-color: white;
   width: 390px;
   height: 280px;
diff --git a/src/app/game/game-intermediate-result/game-drawing-display/game-drawing-display.component.ts b/src/app/game/game-intermediate-result/game-drawing-display/game-drawing-display.component.ts
index 2aaa443e..9e155623 100644
--- a/src/app/game/game-intermediate-result/game-drawing-display/game-drawing-display.component.ts
+++ b/src/app/game/game-intermediate-result/game-drawing-display/game-drawing-display.component.ts
@@ -10,15 +10,18 @@ import { DrawingService } from '../../services/drawing.service';
   styleUrl: './game-drawing-display.component.scss',
 })
 export class GameDrawingDisplayComponent implements OnInit {
-  @Input() hasCorrectGuess: boolean | undefined;
-  @Input() drawingURL: string | undefined;
-  @Input() roundScore: number | undefined;
   secondsUsed = 0;
+  drawingURL = '';
+  hasCorrectGuess = false;
+  roundScore = 0;
 
   constructor(private drawingService: DrawingService) {}
 
   ngOnInit(): void {
     this.secondsUsed = this.drawingService.getSecondsUsed();
+    this.drawingURL = this.drawingService.lastResult.imageData;
+    this.hasCorrectGuess = this.drawingService.lastResult.hasWon;
+    this.roundScore = this.drawingService.lastResult.score;
 
     this.drawingService.resetSecondsUsed();
   }
diff --git a/src/app/game/game-intermediate-result/game-drawing-feedback/game-drawing-feedback.component.html b/src/app/game/game-intermediate-result/game-drawing-feedback/game-drawing-feedback.component.html
index 766e8121..668adc9c 100644
--- a/src/app/game/game-intermediate-result/game-drawing-feedback/game-drawing-feedback.component.html
+++ b/src/app/game/game-intermediate-result/game-drawing-feedback/game-drawing-feedback.component.html
@@ -1,7 +1,7 @@
 <div class="feedback-container">
   <app-i-avatar class="i-avatar" [height]="170" [width]="35" [color]="CustomColorsIO.white"></app-i-avatar>
   <app-speech-bubble
-    class="speech-bubble right"
+    class="speech-bubble"
     [pointerSide]="PointerSide.Left"
     [arrowAlignment]="ArrowAlignment.Center"
     [isFlipped]="false"
diff --git a/src/app/game/game-intermediate-result/game-drawing-feedback/game-drawing-feedback.component.ts b/src/app/game/game-intermediate-result/game-drawing-feedback/game-drawing-feedback.component.ts
index 05eeb064..35bc26f2 100644
--- a/src/app/game/game-intermediate-result/game-drawing-feedback/game-drawing-feedback.component.ts
+++ b/src/app/game/game-intermediate-result/game-drawing-feedback/game-drawing-feedback.component.ts
@@ -14,7 +14,7 @@ import { DrawingService } from '../../services/drawing.service';
   styleUrl: './game-drawing-feedback.component.scss',
 })
 export class GameDrawingFeedbackComponent implements OnInit {
-  @Input() hasCorrectGuess: boolean | undefined; // TODO check if it is possible to disregard undefined type for later
+  hasCorrectGuess = false;
   feedbackTitleKey = '';
   feedbackDescriptionKey = '';
   correctGuess = true;
@@ -27,6 +27,7 @@ export class GameDrawingFeedbackComponent implements OnInit {
   constructor(private drawingService: DrawingService) {}
 
   ngOnInit(): void {
+    this.hasCorrectGuess = this.drawingService.lastResult.hasWon;
     this.setFeedbackText();
     this.label = this.drawingService.label;
   }
diff --git a/src/app/game/game-intermediate-result/game-example-drawings/correct-guess/correct-guess.component.ts b/src/app/game/game-intermediate-result/game-example-drawings/correct-guess/correct-guess.component.ts
index 0563d454..2ef3a556 100644
--- a/src/app/game/game-intermediate-result/game-example-drawings/correct-guess/correct-guess.component.ts
+++ b/src/app/game/game-intermediate-result/game-example-drawings/correct-guess/correct-guess.component.ts
@@ -34,8 +34,8 @@ export class CorrectGuessComponent implements OnInit {
     this.label = this.drawingService.label;
     if (this.gameStateService.isSingleplayer()) {
       this.exampleDrawings = this.exampleDrawingService.getExampleDrawings(3);
-      return;
+    } else {
+      this.exampleDrawings = this.multiplayerService.getExampleDrawings(3);
     }
-    this.exampleDrawings = this.multiplayerService.getExampleDrawings(3);
   }
 }
diff --git a/src/app/game/game-intermediate-result/game-example-drawings/wrong-guess/wrong-guess.component.scss b/src/app/game/game-intermediate-result/game-example-drawings/wrong-guess/wrong-guess.component.scss
index 63c73aad..00266f08 100644
--- a/src/app/game/game-intermediate-result/game-example-drawings/wrong-guess/wrong-guess.component.scss
+++ b/src/app/game/game-intermediate-result/game-example-drawings/wrong-guess/wrong-guess.component.scss
@@ -46,7 +46,3 @@
 .o-avatar {
   margin-top: 2em;
 }
-
-.hideImg {
-  display: none;
-}
diff --git a/src/app/game/game-intermediate-result/game-intermediate-result-footer/game-intermediate-result-footer.component.scss b/src/app/game/game-intermediate-result/game-intermediate-result-footer/game-intermediate-result-footer.component.scss
index 7f03e927..4ef85b0b 100644
--- a/src/app/game/game-intermediate-result/game-intermediate-result-footer/game-intermediate-result-footer.component.scss
+++ b/src/app/game/game-intermediate-result/game-intermediate-result-footer/game-intermediate-result-footer.component.scss
@@ -32,19 +32,11 @@ footer {
   text-decoration: none;
   color: #fff;
 }
-.button-container:before {
-  position: absolute;
-  content: '';
-  display: inline-block;
-  top: -180px;
-  left: 0;
-  width: 30px;
-  height: 100%;
-  animation: shiny-btn1 3s ease-in-out infinite;
-}
+
 .button-container:hover {
   opacity: 0.9;
 }
+
 .button-container:active {
   box-shadow: 4px 4px 6px 0 rgba(255, 255, 255, 0.15), -4px -4px 6px 0 rgba(116, 125, 136, 0.2),
     inset -4px -4px 6px 0 rgba(255, 255, 255, 0.2), inset 4px 4px 6px 0 rgba(0, 0, 0, 0.2);
@@ -59,5 +51,5 @@ footer {
 }
 
 .button-icon {
-  height: 40px;
+  height: 36px;
 }
diff --git a/src/app/game/game-intermediate-result/game-intermediate-result-footer/game-intermediate-result-footer.component.ts b/src/app/game/game-intermediate-result/game-intermediate-result-footer/game-intermediate-result-footer.component.ts
index 087003c2..cad2ae16 100644
--- a/src/app/game/game-intermediate-result/game-intermediate-result-footer/game-intermediate-result-footer.component.ts
+++ b/src/app/game/game-intermediate-result/game-intermediate-result-footer/game-intermediate-result-footer.component.ts
@@ -23,7 +23,7 @@ export class GameIntermediateResultFooterComponent implements OnInit {
 
     if (this.gameStateService.isSingleplayer()) return;
 
-    this.isWaitingForPlayer = true;
+    this.isWaitingForPlayer = true; // default in multiplayer set to true
     this.multiplayerService.stateInfo$.subscribe((res) => {
       if (res.ready) {
         this.isWaitingForPlayer = false;
diff --git a/src/app/game/game-intermediate-result/game-intermediate-result-header/confirm-exit-dialog/confirm-exit-dialog.component.html b/src/app/game/game-intermediate-result/game-intermediate-result-header/confirm-exit-dialog/confirm-exit-dialog.component.html
index 07debff7..c21cdc6f 100644
--- a/src/app/game/game-intermediate-result/game-intermediate-result-header/confirm-exit-dialog/confirm-exit-dialog.component.html
+++ b/src/app/game/game-intermediate-result/game-intermediate-result-header/confirm-exit-dialog/confirm-exit-dialog.component.html
@@ -9,7 +9,7 @@
       ><mat-icon id="confirmExitIdleButtonIcon">home</mat-icon>{{ 'END_NOW_BUTTON' | translate }}</span
     >
   </button>
-  <button class="confirmExitIdleButton" id="stayButton" (click)="closeDialog()">
+  <button class="confirmExitIdleButton" (click)="closeDialog()">
     {{ 'STAY_BUTTON' | translate }}
   </button>
 </mat-dialog-actions>
diff --git a/src/app/game/game-intermediate-result/game-intermediate-result-header/confirm-exit-dialog/confirm-exit-dialog.component.ts b/src/app/game/game-intermediate-result/game-intermediate-result-header/confirm-exit-dialog/confirm-exit-dialog.component.ts
index 51f0ad55..9ca57d59 100644
--- a/src/app/game/game-intermediate-result/game-intermediate-result-header/confirm-exit-dialog/confirm-exit-dialog.component.ts
+++ b/src/app/game/game-intermediate-result/game-intermediate-result-header/confirm-exit-dialog/confirm-exit-dialog.component.ts
@@ -7,6 +7,7 @@ import { Component, inject, ViewEncapsulation } from '@angular/core';
 import { MatButton } from '@angular/material/button';
 import { MatDialogActions, MatDialogContent, MatDialogRef } from '@angular/material/dialog';
 import { MatIcon } from '@angular/material/icon';
+import { DrawingService } from '@/app/game/services/drawing.service';
 
 @Component({
   selector: 'app-confirm-exit-dialog',
@@ -20,7 +21,8 @@ export class ConfirmExitDialogComponent {
   constructor(
     private router: Router,
     private gameStateService: GameStateService,
-    private multiplayerService: MultiplayerService
+    private multiplayerService: MultiplayerService,
+    private drawingService: DrawingService
   ) {}
 
   readonly dialogRef = inject(MatDialogRef<ConfirmExitDialogComponent>);
@@ -36,6 +38,7 @@ export class ConfirmExitDialogComponent {
   goToWelcomePage() {
     this.dialogRef.close();
     this.gameStateService.clearState();
+    this.drawingService.clearState();
 
     if (this.gameStateService.isMultiplayer()) {
       this.multiplayerService.clearState();
diff --git a/src/app/game/game-intermediate-result/game-intermediate-result-header/game-progress-bar/game-progress-bar.component.ts b/src/app/game/game-intermediate-result/game-intermediate-result-header/game-progress-bar/game-progress-bar.component.ts
index 035213fb..24408fd7 100644
--- a/src/app/game/game-intermediate-result/game-intermediate-result-header/game-progress-bar/game-progress-bar.component.ts
+++ b/src/app/game/game-intermediate-result/game-intermediate-result-header/game-progress-bar/game-progress-bar.component.ts
@@ -11,7 +11,6 @@ import { GameStateService } from '@/app/game/services/game-state-service';
   styleUrl: './game-progress-bar.component.scss',
 })
 export class GameProgressBarComponent implements OnInit {
-  roundNumberProgress = '';
   currentRoundNumber = 0;
   totalRounds = 0;
 
diff --git a/src/app/game/game-intermediate-result/game-intermediate-result.component.html b/src/app/game/game-intermediate-result/game-intermediate-result.component.html
index 95b81c98..d675a620 100644
--- a/src/app/game/game-intermediate-result/game-intermediate-result.component.html
+++ b/src/app/game/game-intermediate-result/game-intermediate-result.component.html
@@ -1,13 +1,8 @@
 <div class="container-background">
   <div id="intermediate-container">
     <app-game-intermediate-result-header class="result-header"></app-game-intermediate-result-header>
-    <app-game-drawing-feedback class="avatar-feedback" [hasCorrectGuess]="result?.hasWon"></app-game-drawing-feedback>
-    <app-game-drawing-display
-      class="user-drawing-and-score"
-      [drawingURL]="result?.imageData"
-      [hasCorrectGuess]="result?.hasWon"
-      [roundScore]="result?.score"
-    ></app-game-drawing-display>
+    <app-game-drawing-feedback class="avatar-feedback"></app-game-drawing-feedback>
+    <app-game-drawing-display class="user-drawing-and-score"></app-game-drawing-display>
     <app-game-example-drawings class="example-drawings"></app-game-example-drawings>
     <app-game-intermediate-result-footer class="footer"></app-game-intermediate-result-footer>
   </div>
diff --git a/src/app/game/game-intermediate-result/game-intermediate-result.component.ts b/src/app/game/game-intermediate-result/game-intermediate-result.component.ts
index d3fe25bb..5d3e965e 100644
--- a/src/app/game/game-intermediate-result/game-intermediate-result.component.ts
+++ b/src/app/game/game-intermediate-result/game-intermediate-result.component.ts
@@ -26,9 +26,6 @@ import { GameStateService } from '../services/game-state-service';
   ],
 })
 export class GameIntermediateResultComponent implements OnInit, OnDestroy {
-  result: Result | undefined;
-  isSingleplayer = false;
-
   constructor(
     private gameStateService: GameStateService,
     private drawingService: DrawingService,
@@ -38,8 +35,6 @@ export class GameIntermediateResultComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     this.gameStateService.savePageToLocalStorage(GAMESTATE.intermediateResult);
-    this.isSingleplayer = this.gameStateService.isSingleplayer();
-    this.result = this.drawingService.lastResult;
     this.translationService.loadTranslations(this.translationService.getCurrentLang()).subscribe();
 
     if (this.gameStateService.isSingleplayer()) return;