Merge branch 'main' into 92-scrolling-with-lower-vertical-resolution

christiannagel · web-flow · commit e85ce2899616 · 2024-09-24T19:10:51.000+02:00
diff --git a/src/CodeBreaker.Blazor.Client/CodeBreaker.Blazor.Client.csproj b/src/CodeBreaker.Blazor.Client/CodeBreaker.Blazor.Client.csproj
@@ -6,6 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
     <Configurations>Debug;Release;</Configurations>
+    <UserSecretsId>de8c977a-d6ea-49f0-8090-ba49c09dad1f</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/CodeBreaker.Blazor.Client/Pages/GamePage.razor b/src/CodeBreaker.Blazor.Client/Pages/GamePage.razor
@@ -58,7 +58,7 @@
     {
         <div class="header flex">
             <div>
-                <h2 class="flex-1">@_game?.GameType</h2>
+                <h2 class="flex-1">@Loc["GamePage_Title"] @FormatGameTypeString(_game?.GameType)</h2>
                 <StopWatch Running="@(_gameStatus == GameMode.MoveSet || _gameStatus == GameMode.Started)" />
             </div>
             <div>
diff --git a/src/CodeBreaker.Blazor.Client/Pages/GamePage.razor.cs b/src/CodeBreaker.Blazor.Client/Pages/GamePage.razor.cs
@@ -217,6 +217,9 @@ private async ValueTask OnLocationChanging(LocationChangingContext context)
         StateHasChanged();
     }
 
+    private string? FormatGameTypeString(string? gameTypeString) =>
+        gameTypeString?.Replace("Game", null);
+
     public void Dispose()
     {
         _timer?.Dispose();
diff --git a/src/CodeBreaker.Blazor.Client/Program.cs b/src/CodeBreaker.Blazor.Client/Program.cs
@@ -20,7 +20,7 @@
     options.ProviderOptions.DefaultAccessTokenScopes.Add("openid");
     options.ProviderOptions.DefaultAccessTokenScopes.Add("profile");
     options.ProviderOptions.DefaultAccessTokenScopes.Add("offline_access");
-    options.ProviderOptions.DefaultAccessTokenScopes.Add("https://codebreaker3000.onmicrosoft.com/gateway/games.play");
+    //options.ProviderOptions.DefaultAccessTokenScopes.Add("https://codebreaker3000.onmicrosoft.com/gateway/games.play");
     //options.ProviderOptions.DefaultAccessTokenScopes.Add("https://codebreaker3000.onmicrosoft.com/gateway/live.observe");
     //options.ProviderOptions.DefaultAccessTokenScopes.Add("https://codebreaker3000.onmicrosoft.com/gateway/ranking.query");
     //options.ProviderOptions.DefaultAccessTokenScopes.Add("https://codebreaker3000.onmicrosoft.com/gateway/bot.trigger");
diff --git a/src/CodeBreaker.Blazor.Client/wwwroot/appsettings.Development.json b/src/CodeBreaker.Blazor.Client/wwwroot/appsettings.Development.json
@@ -1,6 +1,11 @@
 {
   "DetailedErrors": true,
-  "AzureAdB2C:RedirectUri": "http://localhost:5208/authentication/login-callback",
+  "AzureAdB2C": {
+    "Authority": "https://codebreakertest.b2clogin.com/codebreakertest.onmicrosoft.com/B2C_1_SUSI",
+    "ClientId": "6f3b0b17-f116-4b56-a63f-74a16b02730a",
+    "ValidateAuthority": false,
+    "RedirectUri": "http://localhost:5208/authentication/login-callback"
+  },
   "GameServiceBaseAddress": "http://localhost:5011/games",
   "UserServicePublicBaseAddress": "http://localhost:5011/users/public"
 }
diff --git a/src/CodeBreaker.Blazor.Client/wwwroot/appsettings.Production.json b/src/CodeBreaker.Blazor.Client/wwwroot/appsettings.Production.json
@@ -1,2 +1,10 @@
 {
+  "AzureAdB2C": {
+    "Authority": "https://codebreaker3000.b2clogin.com/codebreaker3000.onmicrosoft.com/B2C_1_SUSI",
+    "ClientId": "558b37b7-0a71-4463-9d3c-d74220b7e5ee",
+    "ValidateAuthority": false,
+    "RedirectUri": "https://blazor.codebreaker.app/authentication/login-callback"
+  },
+  "GameServiceBaseAddress": "https://codebreaker.cninnovation.com/games",
+  "UserServicePublicBaseAddress": "https://codebreaker.cninnovation.com/users/public"
 }
diff --git a/src/CodeBreaker.Blazor.Client/wwwroot/appsettings.Staging.json b/src/CodeBreaker.Blazor.Client/wwwroot/appsettings.Staging.json
@@ -0,0 +1,11 @@
+{
+  "DetailedErrors": true,
+  "AzureAdB2C": {
+    "Authority": "https://codebreakertest.b2clogin.com/codebreakertest.onmicrosoft.com/B2C_1_SUSI",
+    "ClientId": "6f3b0b17-f116-4b56-a63f-74a16b02730a",
+    "ValidateAuthority": false,
+    "RedirectUri": "https://testblazor.codebreaker.app/authentication/login-callback"
+  },
+  "GameServiceBaseAddress": "https://testgateway.codebreaker.app/games",
+  "UserServicePublicBaseAddress": "https://testgateway.codebreaker.app/users/public"
+}
diff --git a/src/CodeBreaker.Blazor.Client/wwwroot/appsettings.json b/src/CodeBreaker.Blazor.Client/wwwroot/appsettings.json
@@ -1,10 +1,2 @@
 {
-  "AzureAdB2C": {
-    "Authority": "https://codebreaker3000.b2clogin.com/codebreaker3000.onmicrosoft.com/B2C_1_SUSI",
-    "ClientId": "558b37b7-0a71-4463-9d3c-d74220b7e5ee",
-    "ValidateAuthority": false,
-    "RedirectUri": "https://blazor.codebreaker.app/authentication/login-callback"
-  },
-  "GameServiceBaseAddress": "https://codebreaker.cninnovation.com/games",
-  "UserServicePublicBaseAddress": "https://codebreaker.cninnovation.com/users/public"
 }
diff --git a/src/CodeBreaker.Blazor/appsettings.Production.json b/src/CodeBreaker.Blazor/appsettings.Production.json
@@ -1,2 +1,4 @@
 {
+  "GameServiceBaseAddress": "https://codebreaker.cninnovation.com/games",
+  "UserServicePublicBaseAddress": "https://codebreaker.cninnovation.com/users/public"
 }
diff --git a/src/CodeBreaker.Blazor/appsettings.Staging.json b/src/CodeBreaker.Blazor/appsettings.Staging.json
@@ -0,0 +1,4 @@
+{
+  "GameServiceBaseAddress": "https://testgateway.codebreaker.app/games",
+  "UserServicePublicBaseAddress": "https://testgateway.codebreaker.app/users/public"
+}
diff --git a/src/CodeBreaker.Blazor/appsettings.json b/src/CodeBreaker.Blazor/appsettings.json
@@ -1,4 +1,2 @@
 {
-  "GameServiceBaseAddress": "https://codebreaker.cninnovation.com/games",
-  "UserServicePublicBaseAddress": "https://codebreaker.cninnovation.com/users/public"
 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@`
`58`	`58`	`{`
`59`	`59`	`<div class="header flex">`
`60`	`60`	`<div>`
`61`		`- <h2 class="flex-1">@_game?.GameType</h2>`
	`61`	`+ <h2 class="flex-1">@Loc["GamePage_Title"] @FormatGameTypeString(_game?.GameType)</h2>`
`62`	`62`	`<StopWatch Running="@(_gameStatus == GameMode.MoveSet \|\| _gameStatus == GameMode.Started)" />`
`63`	`63`	`</div>`
`64`	`64`	`<div>`
Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,9 @@ private async ValueTask OnLocationChanging(LocationChangingContext context)`
`217`	`217`	`StateHasChanged();`
`218`	`218`	`}`
`219`	`219`
	`220`	`+ private string? FormatGameTypeString(string? gameTypeString) =>`
	`221`	`+ gameTypeString?.Replace("Game", null);`
	`222`	`+`
`220`	`223`	`public void Dispose()`
`221`	`224`	`{`
`222`	`225`	`_timer?.Dispose();`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,11 @@`
`1`	`1`	`{`
`2`	`2`	`"DetailedErrors": true,`
`3`		`- "AzureAdB2C:RedirectUri": "http://localhost:5208/authentication/login-callback",`
	`3`	`+ "AzureAdB2C": {`
	`4`	`+ "Authority": "https://codebreakertest.b2clogin.com/codebreakertest.onmicrosoft.com/B2C_1_SUSI",`
	`5`	`+ "ClientId": "6f3b0b17-f116-4b56-a63f-74a16b02730a",`
	`6`	`+ "ValidateAuthority": false,`
	`7`	`+ "RedirectUri": "http://localhost:5208/authentication/login-callback"`
	`8`	`+ },`
`4`	`9`	`"GameServiceBaseAddress": "http://localhost:5011/games",`
`5`	`10`	`"UserServicePublicBaseAddress": "http://localhost:5011/users/public"`
`6`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,10 @@`
`1`	`1`	`{`
	`2`	`+ "AzureAdB2C": {`
	`3`	`+ "Authority": "https://codebreaker3000.b2clogin.com/codebreaker3000.onmicrosoft.com/B2C_1_SUSI",`
	`4`	`+ "ClientId": "558b37b7-0a71-4463-9d3c-d74220b7e5ee",`
	`5`	`+ "ValidateAuthority": false,`
	`6`	`+ "RedirectUri": "https://blazor.codebreaker.app/authentication/login-callback"`
	`7`	`+ },`
	`8`	`+ "GameServiceBaseAddress": "https://codebreaker.cninnovation.com/games",`
	`9`	`+ "UserServicePublicBaseAddress": "https://codebreaker.cninnovation.com/users/public"`
`2`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,2 @@`
`1`	`1`	`{`
`2`		`- "AzureAdB2C": {`
`3`		`- "Authority": "https://codebreaker3000.b2clogin.com/codebreaker3000.onmicrosoft.com/B2C_1_SUSI",`
`4`		`- "ClientId": "558b37b7-0a71-4463-9d3c-d74220b7e5ee",`
`5`		`- "ValidateAuthority": false,`
`6`		`- "RedirectUri": "https://blazor.codebreaker.app/authentication/login-callback"`
`7`		`- },`
`8`		`- "GameServiceBaseAddress": "https://codebreaker.cninnovation.com/games",`
`9`		`- "UserServicePublicBaseAddress": "https://codebreaker.cninnovation.com/users/public"`
`10`	`2`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,4 @@`
`1`	`1`	`{`
	`2`	`+ "GameServiceBaseAddress": "https://codebreaker.cninnovation.com/games",`
	`3`	`+ "UserServicePublicBaseAddress": "https://codebreaker.cninnovation.com/users/public"`
`2`	`4`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "GameServiceBaseAddress": "https://testgateway.codebreaker.app/games",
 +  "UserServicePublicBaseAddress": "https://testgateway.codebreaker.app/users/public"
 +}