Merge branch 'ValoSpectra:main' into main

b4iterdev · Feb 2, 2025 · 8d79321 · 8d79321
2 parents 63b4f4c + 4bde3c3
commit 8d79321
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spectra-frontend",
-  "version": "0.2.12",
+  "version": "0.2.15",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --configuration development",

diff --git a/src/app/endround/endround.component.html b/src/app/endround/endround.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="match.roundPhase === 'end'">
+<div *ngIf="this.endRoundEnabled && match.roundPhase === 'end'">
   <div class="intro-box">
     <div class="intro-box-content" [style.background-image]="setTournamentBackgroundImage()">
       <div class="intro-info-box">

diff --git a/src/app/endround/endround.component.scss b/src/app/endround/endround.component.scss
@@ -41,7 +41,7 @@
 
 .intro-info-image {
   position: relative;
-  max-height: 100%;
+  max-height: 70%;
   max-width: 100%;
 }
 

diff --git a/src/app/endround/endround.component.ts b/src/app/endround/endround.component.ts
@@ -7,11 +7,15 @@ import { Component, Input, OnChanges, SimpleChanges, OnInit } from "@angular/cor
 export class EndroundComponent implements OnChanges, OnInit {
   @Input() match!: any;
   tournamentUrl = "../../assets/misc/logo.webp";
+  endRoundEnabled = false;
 
   tournamentBackgroundUrl = "../../assets/misc/backdrop.webp";
 
   teamWon = 0;
   ngOnInit(): void {
+    this.endRoundEnabled = this.match?.tools?.tournamentInfo?.enabled || false;
+    if (!this.endRoundEnabled) return;
+
     this.tournamentUrl =
       this.match?.tools?.tournamentInfo?.logoUrl && this.match.tools.tournamentInfo.logoUrl !== ""
         ? this.match.tools.tournamentInfo.logoUrl

diff --git a/src/app/testing/testing.component.ts b/src/app/testing/testing.component.ts
@@ -107,6 +107,12 @@ export class TestingComponent implements AfterViewInit {
         left: "Group A",
         right: "Group B",
       },
+      tournamentInfo: {
+        name: "",
+        logoUrl: "",
+        backdropUrl: "",
+        enabled: true,
+      },
     };
 
     this.team2.swapColor();

diff --git a/src/app/tracker/tracker.component.ts b/src/app/tracker/tracker.component.ts
@@ -49,6 +49,11 @@ export class TrackerComponent implements OnInit {
           left: "",
           right: "",
         },
+        tournamentInfo: {
+          name: "",
+          logoUrl: "",
+          backdropUrl: "",
+        },
       },
     };