fix: ugyldige asset referanser

computas · Jun 13, 2024 · bb0511d · bb0511d
1 parent ca006a9
commit bb0511d
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 98 deletions.
diff --git a/src/app/game/game-draw/game-draw.component.html b/src/app/game/game-draw/game-draw.component.html
@@ -1,19 +1,19 @@
 <div class="drawing-container">
   <div class="drawing-header">
-      <h1><span class="drawing-header-text">Tegn: </span>{{ guessWord | uppercase }}</h1>
-      <div class="drawing-seconds">
-        <div class="timer-container">
-          <mat-icon class="timer-icon" aria-label="Example home icon">timer</mat-icon>
-          <span #countDown>
-            {{ timeLeft }}
-          </span>
-        </div>
-      </div>
-      <button mat-icon-button color="primary" aria-label="icon button with a trash icon" (click)="clear()">
-        <span class="material-icons">
-          <mat-icon class="delete-icon" aria-label="delete icon">delete</mat-icon>
+    <h1><span class="drawing-header-text">Tegn: </span>{{ guessWord | uppercase }}</h1>
+    <div class="drawing-seconds">
+      <div class="timer-container">
+        <mat-icon class="timer-icon" aria-label="Example home icon">timer</mat-icon>
+        <span #countDown>
+          {{ timeLeft }}
         </span>
-      </button>
+      </div>
+    </div>
+    <button mat-icon-button color="primary" aria-label="icon button with a trash icon" (click)="clear()">
+      <span class="material-icons">
+        <mat-icon class="delete-icon" aria-label="delete icon">delete</mat-icon>
+      </span>
+    </button>
   </div>
   <div>
     <canvas
@@ -33,7 +33,11 @@ <h1><span class="drawing-header-text">Tegn: </span>{{ guessWord | uppercase }}</
 
 <div class="avatar-container">
   <div class="">
-    <img src="../../../assets/illustrations/IO_Illustrasjoner-1_1360x939.png" alt="Avatar guessing words" class="guessing-avatar" />
+    <img
+      src="assets/illustrations/IO_Illustrasjoner-1_1360x939.png"
+      alt="Avatar guessing words"
+      class="guessing-avatar"
+    />
   </div>
   <div class="guess-label me">
     <span>Hmm... <span *ngIf="AI_GUESS">kan det være &nbsp;</span>{{ AI_GUESS | uppercase }} </span>

diff --git a/src/app/game/game-info/game-info.component.html b/src/app/game/game-info/game-info.component.html
@@ -1,15 +1,13 @@
 <div class="game-info-container-background">
   <div class="game-info-container">
-    <div><img class="logo" src="../../../assets/logo/IO-logo-inverted_transparent-bg.png" alt="logo" /></div>
+    <div><img class="logo" src="assets/logo/IO-logo-inverted_transparent-bg.png" alt="logo" /></div>
     <div class="game-info-text-content">
-      <h1 class="player-mode" *ngIf="isSinglePlayer">
-        <mat-icon>person</mat-icon>1 spiller
-      </h1>
-      <h1 class="player-mode" *ngIf="isMultiPlayer">
-        <mat-icon>people_alt</mat-icon>2 spillere
-      </h1>
+      <h1 class="player-mode" *ngIf="isSinglePlayer"><mat-icon>person</mat-icon>1 spiller</h1>
+      <h1 class="player-mode" *ngIf="isMultiPlayer"><mat-icon>people_alt</mat-icon>2 spillere</h1>
       <div class="game-info-text-content-list">
-        <div class="avatar"><img class="avatar-image" src="../../../assets/illustrations/IO_Illustrasjoner-1_1360x939.png" alt="avatar" /></div>
+        <div class="avatar">
+          <img class="avatar-image" src="assets/illustrations/IO_Illustrasjoner-1_1360x939.png" alt="avatar" />
+        </div>
         <div class="game-info-text-content-list-text">
           <h1 class="game-info-text-header" *ngIf="isSinglePlayer">Slik spiller du:</h1>
           <h1 class="game-info-text-header" *ngIf="isMultiPlayer">Slik spiller dere:</h1>
@@ -28,11 +26,12 @@ <h1 class="game-info-text-header" *ngIf="isMultiPlayer">Slik spiller dere:</h1>
           </div>
         </button>
         <button mat-raised-button class="button" id="get-word-button" (click)="startDrawing()">
-          <div class="button-text">Start
+          <div class="button-text">
+            Start
             <mat-icon class="button-icon play_arrow" aria-label="play_arrow">arrow_forward_ios</mat-icon>
           </div>
         </button>
       </div>
     </div>
   </div>
-</div>
+</div>
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
@@ -1,14 +1,18 @@
 <div class="intermediate-container-background">
   <div id="intermediate-container">
-    <div><img class="logo" src="../../../assets/logo/IO-logo-inverted_transparent-bg.png" alt="logo" /></div>
+    <div><img class="logo" src="assets/logo/IO-logo-inverted_transparent-bg.png" alt="logo" /></div>
     <div>
       <ng-container *ngIf="result">
         <div class="intermediate-content">
           <div class="avatar-container" *ngIf="result.hasWon">
-            <div class="avatar"><img class="avatar-image" src="../../../assets/illustrations/IO_Illustrasjoner-1_1360x939.png" alt="avatar" /></div>
+            <div class="avatar">
+              <img class="avatar-image" src="assets/illustrations/IO_Illustrasjoner-1_1360x939.png" alt="avatar" />
+            </div>
           </div>
           <div class="avatar-container" *ngIf="!result.hasWon">
-            <div class="avatar"><img class="avatar-image" src="../../../assets/illustrations/IO_Illustrasjoner-1_1360x939.png" alt="avatar" /></div>
+            <div class="avatar">
+              <img class="avatar-image" src="assets/illustrations/IO_Illustrasjoner-1_1360x939.png" alt="avatar" />
+            </div>
           </div>
           <div class="intermediate-container">
             <div class="word-text" *ngIf="result.hasWon">
@@ -25,7 +29,12 @@ <h1>{{ lostSentence }}</h1>
             </div>
           </div>
           <div class="avatar-container-spacer"></div>
-          <button *ngIf="gameOver && !waitingForPlayer" mat-raised-button class="next-word-button" (click)="getSummary()">
+          <button
+            *ngIf="gameOver && !waitingForPlayer"
+            mat-raised-button
+            class="next-word-button"
+            (click)="getSummary()"
+          >
             Oppsummering
           </button>
           <button
@@ -36,9 +45,7 @@ <h1>{{ lostSentence }}</h1>
           >
             Neste ord
           </button>
-          <h1 class="waiting" *ngIf="isMultiplayer && waitingForPlayer">
-            Venter på spiller
-          </h1>
+          <h1 class="waiting" *ngIf="isMultiplayer && waitingForPlayer">Venter på spiller</h1>
         </div>
       </ng-container>
       <ng-template #loading>

diff --git a/src/app/game/game-multiplayer/lobby/lobby.component.html b/src/app/game/game-multiplayer/lobby/lobby.component.html
@@ -1,9 +1,7 @@
 <div class="container-background">
   <div class="container">
-    <div><img class="logo" src="../../../../assets/logo/IO-logo-inverted_transparent-bg.png" alt="logo" /></div>
-    <div class="waiting-text">
-      Venter på spiller 2
-    </div>
+    <div><img class="logo" src="assets/logo/IO-logo-inverted_transparent-bg.png" alt="logo" /></div>
+    <div class="waiting-text">Venter på spiller 2</div>
     <div *ngIf="waitingForOtherPlayer">
       <mat-spinner></mat-spinner>
     </div>
@@ -18,4 +16,4 @@
       </button>
     </a>
   </div>
-</div>
+</div>
diff --git a/src/app/game/game-multiplayer/services/pairing.service.spec.ts b/src/app/game/game-multiplayer/services/pairing.service.spec.ts
diff --git a/src/app/game/game-multiplayer/services/pairing.service.ts b/src/app/game/game-multiplayer/services/pairing.service.ts
@@ -5,7 +5,7 @@ import { environment } from '../../../../environments/environment';
   providedIn: 'root',
 })
 export class PairingService {
-  private pairID: string;
+  private pairID = '';
 
   constructor() {
     const id = localStorage.getItem('pairID');

diff --git a/src/app/game/game-multiplayer/services/web-socket.service.mock.ts b/src/app/game/game-multiplayer/services/web-socket.service.mock.ts
diff --git a/src/app/game/game-result/game-result.component.html b/src/app/game/game-result/game-result.component.html
@@ -1,6 +1,6 @@
 <div class="result-container-background">
   <div class="result-container">
-    <div><img class="logo" src="../../../assets/logo/IO-logo-inverted_transparent-bg.png" alt="logo" /></div>
+    <div><img class="logo" src="assets/logo/IO-logo-inverted_transparent-bg.png" alt="logo" /></div>
     <div *ngIf="ismultiplayer && hasWon" id="result-header" class="result-header-multi">
       <h1 class="result-header-multi">
         <span class="winner">Du vant!</span>
@@ -17,30 +17,30 @@ <h1 *ngIf="!ismultiplayer" id="result-header">Ditt resultat:</h1>
     <div class="result-section">
       <div id="result-card-container">
         <div id="result-card" *ngFor="let result of results">
-          <img mat-card-image [src]="result.imageData"
+          <img
+            mat-card-image
+            [src]="result.imageData"
             [className]="result.hasWon ? 'game-result-img card-won' : 'game-result-img card-loss'"
             alt=""
           />
           <p id="result-subtitile">
-            <span *ngIf="result.hasWon" class="material-icons" id="won">
-              done
-            </span>
-            <span *ngIf="!result.hasWon" class="material-icons" id="loss">
-              clear
-            </span>
-            <span *ngIf="result.word" class="result-word">{{ result.word | titlecase }}
-              <span *ngIf="ismultiplayer" class="multiplayer-score"> {{ result.score }} p</span></span>
+            <span *ngIf="result.hasWon" class="material-icons" id="won"> done </span>
+            <span *ngIf="!result.hasWon" class="material-icons" id="loss"> clear </span>
+            <span *ngIf="result.word" class="result-word"
+              >{{ result.word | titlecase }}
+              <span *ngIf="ismultiplayer" class="multiplayer-score"> {{ result.score }} p</span></span
+            >
           </p>
         </div>
       </div>
     </div>
     <div class="button-footer">
-      <a href="/" class="link-float"><button mat-raised-button class="btn btn-again">
-          <span class="material-icons icon">
-            autorenew
-          </span>
+      <a href="/" class="link-float"
+        ><button mat-raised-button class="btn btn-again">
+          <span class="material-icons icon"> autorenew </span>
           Spill igjen
-        </button></a>
+        </button></a
+      >
     </div>
   </div>
 </div>
diff --git a/src/app/game/game-word-to-draw/game-word-to-draw.component.html b/src/app/game/game-word-to-draw/game-word-to-draw.component.html
@@ -1,6 +1,6 @@
 <div class="word-container-background">
   <div class="word-container">
-    <div><img class="logo" src="../../../assets/logo/IO-logo-inverted_transparent-bg.png" alt="logo" /></div>
+    <div><img class="logo" src="assets/logo/IO-logo-inverted_transparent-bg.png" alt="logo" /></div>
     <h1 class="playernr" *ngIf="isMultiPlayer">Spiller {{ playernr }}</h1>
     <div class="word-text">
       <div class="words-remaining">{{ guessUsed }}/3</div>
@@ -16,7 +16,9 @@ <h1 class="word-to-guess header">{{ word | uppercase }}</h1>
       </div>
     </div>
     <div class="word-footer">
-      <div class="avatar"><img class="avatar-image" src="../../../assets/illustrations/IO_Illustrasjoner-1_1360x939.png" alt="avatar" /></div>
+      <div class="avatar">
+        <img class="avatar-image" src="assets/illustrations/IO_Illustrasjoner-1_1360x939.png" alt="avatar" />
+      </div>
       <div *ngIf="!loading">
         <button *ngIf="isSinglePlayer" mat-raised-button class="draw-word-button" (click)="drawWord.emit(true)">
           Tegn

diff --git a/src/app/welcome/welcome.component.html b/src/app/welcome/welcome.component.html
@@ -1,13 +1,17 @@
 <div class="container-background">
   <div class="container">
-    <div><img class="logo"
-              src="@/assets/logo/IO-logo-inverted_transparent-bg.png"
-              alt="logo"
-              (click)="goToAdmin()"
-              aria-label="Gå til admin side"/></div>
+    <div>
+      <img
+        class="logo"
+        src="assets/logo/IO-logo-inverted_transparent-bg.png"
+        alt="logo"
+        (click)="goToAdmin()"
+        aria-label="Gå til admin side"
+      />
+    </div>
     <div class="play-container">
       <div class="text-container">
-         <div class="avatar"><img class="avatar-image" src="@/assets/logo/io_logoanimasjon.gif" alt="avatar" /></div>
+        <div class="avatar"><img class="avatar-image" src="assets/logo/io_logoanimasjon.gif" alt="avatar" /></div>
         <div class="info-text">
           <span>
             Hei, jeg heter<span class="avatar-name"> IO</span>. <br />