Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d3de412
Add match color and color lock data
BucketRaphi Jul 14, 2026
4a04cba
Maybe not forget CTRL+S next time
BucketRaphi Jul 14, 2026
9b78969
Adjust and sort colors to reflect in game list
BucketRaphi Jul 14, 2026
040714b
Add id to MatchColor interface
BucketRaphi Jul 14, 2026
a4a01e5
Add angular materials package
BucketRaphi Jul 15, 2026
f540c8c
Add first basic implementation of colors dialog
BucketRaphi Jul 15, 2026
c37a398
Add settings for dialogs in app config
BucketRaphi Jul 15, 2026
80f5fb8
Remove deprecated fetch function from tests
BucketRaphi Jul 15, 2026
d9db10a
Set cursor to pointer on toggle slider hover
BucketRaphi Jul 15, 2026
79b800b
Add popup button for colors to sidebar
BucketRaphi Jul 15, 2026
2863ad4
Add signals for color and color lock state to broadcast state service
BucketRaphi Jul 15, 2026
0214d70
Add dialog material overrides to styles css
BucketRaphi Jul 15, 2026
cb2f128
Add migration for match color database properties
BucketRaphi Jul 15, 2026
f8008f0
Add match color properties to BroadcastState and adjust all unit tests
BucketRaphi Jul 15, 2026
5903391
Adjust class names in map card to avoid duplication
BucketRaphi Jul 15, 2026
dc39641
Add effect for setting match colors on state update
BucketRaphi Jul 15, 2026
9ba6d17
Adjust change colors dialog stylings and functionality
BucketRaphi Jul 15, 2026
618b884
Set alpha and bravo colors to white and black by default for debugging
BucketRaphi Jul 15, 2026
6661cae
Add advance color button to sidebar
BucketRaphi Jul 15, 2026
53192f8
Add unit tests for match colors
BucketRaphi Jul 15, 2026
4d67696
Add backend unit tests for color properties
BucketRaphi Jul 15, 2026
9c6a23f
Update docs to reflect match colors changes
BucketRaphi Jul 15, 2026
588b2ad
Add E2E tests for color settings
BucketRaphi Jul 15, 2026
1902cbf
Adjust styling of dialog
BucketRaphi Jul 15, 2026
6badf2e
Use self closing tag for toggle sliders
BucketRaphi Jul 15, 2026
56116c5
Merge branch 'master' into feature/144-add-all-match-colors
BucketRaphi Jul 15, 2026
54cd675
Use correct values for comm box time data intervals in migration
BucketRaphi Jul 15, 2026
10331c7
Rename Farbeinstellungen
BucketRaphi Jul 17, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Backend/DSB.StreamBackend/Dtos/BroadcastStateDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,14 @@ public class BroadcastStateDto
/// Gets or sets the start time of the match
/// </summary>
public DateTime StartTime { get; set; }

/// <summary>
/// Gets or sets the current id of a `MatchColor` object in FE
/// </summary>
public int CurrentColorsId { get; set; } = 0;

/// <summary>
/// Gets or sets if color lock is currently active or not
/// </summary>
public bool ColorLockActive { get; set; } = false;
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
migrationBuilder.InsertData(
table: "CommentatorBoxTimeData",
columns: new[] { "Id", "ShowDisplayIntervalInSeconds", "HideDisplayIntervalInSeconds" },
values: new object[] { 1, 5, 50 }
values: new object[] { 1, 50, 5 }
);
}

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
using Microsoft.EntityFrameworkCore.Migrations;

#nullable disable

namespace DSB.StreamBackend.Migrations
{
/// <inheritdoc />
public partial class addMatchColorSwitching : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "ColorLockActive",
table: "BroadcastStates",
type: "INTEGER",
nullable: false,
defaultValue: false);

migrationBuilder.AddColumn<int>(
name: "CurrentColorsId",
table: "BroadcastStates",
type: "INTEGER",
nullable: false,
defaultValue: 0);

migrationBuilder.UpdateData(
table: "BroadcastStates",
keyColumn: "Id",
keyValue: 1,
columns: new[] { "ColorLockActive", "CurrentColorsId" },
values: new object[] { false, 0 });
}

/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ColorLockActive",
table: "BroadcastStates");

migrationBuilder.DropColumn(
name: "CurrentColorsId",
table: "BroadcastStates");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property<bool>("AlphaIsLeft")
.HasColumnType("INTEGER");

b.Property<bool>("ColorLockActive")
.HasColumnType("INTEGER");

b.Property<string>("Commentator1")
.IsRequired()
.HasColumnType("TEXT");
Expand All @@ -34,6 +37,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.IsRequired()
.HasColumnType("TEXT");

b.Property<int>("CurrentColorsId")
.HasColumnType("INTEGER");

b.Property<int>("Division")
.HasColumnType("INTEGER");

Expand Down Expand Up @@ -85,8 +91,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
{
Id = 1,
AlphaIsLeft = true,
ColorLockActive = false,
Commentator1 = "",
Commentator2 = "",
CurrentColorsId = 0,
Division = 1,
ScoreAlpha = 0,
ScoreBravo = 0,
Expand Down
10 changes: 10 additions & 0 deletions Backend/DSB.StreamBackend/Models/BroadcastStateEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,14 @@ public class BroadcastStateEntity
/// Gets or sets the start time of the match
/// </summary>
public DateTime StartTime { get; set; }

/// <summary>
/// Gets or sets the current id of a `MatchColor` object in FE
/// </summary>
public int CurrentColorsId { get; set; } = 0;

/// <summary>
/// Gets or sets if color lock is currently active or not
/// </summary>
public bool ColorLockActive { get; set; } = false;
}
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ public async Task<BroadcastStateDto> UpdateStateAsync(BroadcastStateDto dto)

entity.StartTime = dto.StartTime;

entity.CurrentColorsId = dto.CurrentColorsId;
entity.ColorLockActive = dto.ColorLockActive;

UpdateMaps(entity, dto.Maps);

await db.SaveChangesAsync();
Expand Down Expand Up @@ -257,7 +260,9 @@ private static BroadcastStateDto ToDto(BroadcastStateEntity entity)
Season = entity.Season,
Division = entity.Division,
Week = entity.Week,
StartTime = entity.StartTime
StartTime = entity.StartTime,
CurrentColorsId = entity.CurrentColorsId,
ColorLockActive = entity.ColorLockActive
};
}
}
Loading
Loading