From 203e6f669040990c3ac63c6344098a9de505d851 Mon Sep 17 00:00:00 2001 From: Dunkel <7890309+DarkView@users.noreply.github.com> Date: Sun, 2 Feb 2025 14:47:39 +0100 Subject: [PATCH 1/3] Fix round end display overflowing --- src/app/endround/endround.component.scss | 2 +- src/app/tracker/tracker.component.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/endround/endround.component.scss b/src/app/endround/endround.component.scss index 039486f..51b085f 100644 --- 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/tracker/tracker.component.ts b/src/app/tracker/tracker.component.ts index 78101c1..a7c033c 100644 --- 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: "", + }, }, }; From 52b301b1ab9fc2ff4591d6fb9af18b8dd53799ac Mon Sep 17 00:00:00 2001 From: Dunkel <7890309+DarkView@users.noreply.github.com> Date: Sun, 2 Feb 2025 14:48:44 +0100 Subject: [PATCH 2/3] Bump version (and match with rest) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e8b9fd2..528a83d 100644 --- 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", From 4bde3c3a29bd0c195ae6593d1d3d4bcc31f4043b Mon Sep 17 00:00:00 2001 From: Dunkel <7890309+DarkView@users.noreply.github.com> Date: Sun, 2 Feb 2025 15:09:58 +0100 Subject: [PATCH 3/3] Check if endround should be enabled --- src/app/endround/endround.component.html | 2 +- src/app/endround/endround.component.ts | 4 ++++ src/app/testing/testing.component.ts | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/app/endround/endround.component.html b/src/app/endround/endround.component.html index 04646ea..e7a4fc4 100644 --- a/src/app/endround/endround.component.html +++ b/src/app/endround/endround.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/endround/endround.component.ts b/src/app/endround/endround.component.ts index 9055d38..2d43170 100644 --- 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 index 5378a3f..d0d3d92 100644 --- 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();