mcmuzzle/LittleTown
1
0
Fork 0
Code Issues 1 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: mcmuzzle:main
Branches Tags
mcmuzzle:main mcmuzzle:addingBuildingsToFrontend mcmuzzle:renovate/dotnet-monorepo mcmuzzle:renovate/swashbuckle-aspnetcore-monorepo
..
compare: mcmuzzle:renovate/swashbuckle-aspnetcore-monorepo
Branches Tags
mcmuzzle:addingBuildingsToFrontend mcmuzzle:main mcmuzzle:renovate/dotnet-monorepo mcmuzzle:renovate/swashbuckle-aspnetcore-monorepo

1 Commits
main ... renovate/s

Author SHA1 Message Date
Renovate Bot
80d12bd858 Update dependency Swashbuckle.AspNetCore to 10.1.3
All checks were successful
Main Build Process / Build & Test (pull_request) Successful in 1m19s
Details
2026-02-18 09:47:58 +00:00
29 changed files with 12 additions and 976 deletions
Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -17,4 +17,3 @@ obj
report report
tools/ tools/
TestResults TestResults
/src/.vs

2
src/LittleTown.Api/LittleTown.Api.csproj
View File

@@ -9,7 +9,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.2" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.2" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.3" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
src/LittleTown.Api/LittleTown.Api.csproj.user
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ActiveDebugProfile>https</ActiveDebugProfile>
</PropertyGroup>
</Project>

68
src/LittleTown.Blazor/LittleTown.Blazor.Client/Components/MatchBoard.razor
View File

@@ -1,68 +0,0 @@
<div class="board">
<div class="terrain">
@foreach (var row in MatchViewModel.Rows)
{
<div class="terrain-row">
@foreach (var cell in row)
{
<span class="terrain-cell">@cell</span>
}
</div>
}
</div>
<div class="footer">
<div class="topScore">
@for(int i = 0; i < 25; i++)
{
<div class="scoreItem">@i</div>
}
</div>
<div class="centerFooter">
<div class="leftScore">
@for (int i = 59; i >= 55; i--)
{
<div class="scoreItem">@i</div>
}
</div>
<div class="infos">
<div class="infos-row">
<div class="turns">
@for(int i = 0; i < 4; i++)
{
<div class="turn">@i</div>
}
</div>
@for (int i = 0; i < 6; i++)
{
<div class="building">
<div>building @i</div>
</div>
}
</div>
<div class="infos-row">
<div class="construction">constructions</div>
<div class="fields">fields</div>
@for (int i = 0; i < 6; i++)
{
<div class="building">
<div>building @(i+6)</div>
</div>
}
</div>
</div>
<div class="rightScore">
@for (int i = 25; i < 30; i++)
{
<div class="scoreItem">@i</div>
}
</div>
</div>
<div class="bottomScore">
@for (int i = 54; i >= 30; i--)
{
<div class="scoreItem">@i</div>
}
</div>
</div>
</div>

11
src/LittleTown.Blazor/LittleTown.Blazor.Client/Components/MatchBoard.razor.cs
View File

@@ -1,11 +0,0 @@
using LittleTown.Blazor.Client.ViewModels;
using Microsoft.AspNetCore.Components;
namespace LittleTown.Blazor.Client.Components
{
public partial class MatchBoard
{
[Parameter, EditorRequired]
public MatchViewModel MatchViewModel { get; init; }
}
}

110
src/LittleTown.Blazor/LittleTown.Blazor.Client/Components/MatchBoard.razor.css
View File

@@ -1,110 +0,0 @@
.board {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
}
.terrain {
width: 100%;
background-color: red;
box-sizing: border-box;
}
.terrain-row {
display: grid;
grid-auto-flow: column;
grid-auto-columns: 1fr; /* toutes les cellules même largeur */
}
.terrain-cell {
aspect-ratio: 1 / 1; /* largeur = hauteur */
display: flex;
align-items: center;
justify-content: center;
border: 1px solid black;
}
.footer {
width: 100%;
background-color: gray;
display: flex;
flex-direction: column;
}
.topScore {
flex: 1;
display: flex;
flex-direction: row;
}
.bottomScore {
flex: 1;
display: flex;
flex-direction: row;
}
.centerFooter{
flex:5;
display: flex;
flex-direction:row;
}
.scoreItem {
flex: 1;
border: 1px solid;
aspect-ratio: 1 / 1;
}
.leftScore {
flex:1;
display:flex;
flex-direction:column;
}
.rightScore {
flex: 1;
display: flex;
flex-direction: column;
}
.infos {
flex:23;
display: flex;
flex-wrap:wrap;
}
.building {
height: 100%;
aspect-ratio: 1 / 1;
flex: 0 0 auto;
background: lightblue;
border: 1px solid black;
}
.turns {
flex: 1;
display: flex;
flex-direction: row;
}
.turn {
flex: 1;
}
.infos-row{
height:50%;
width:100%;
background-color:blue;
display:flex;
flex-direction:row;
}
.construction {
flex:1;
}
.fields {
height: 100%;
aspect-ratio: 1 / 1; /* largeur = hauteur */
flex: 0 0 auto;
background: lightblue;
border: 1px solid black;
}

5
src/LittleTown.Blazor/LittleTown.Blazor.Client/LittleTown.Blazor.Client.csproj
View File

@@ -13,9 +13,4 @@
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\LittleTown.Core\LittleTown.Core.csproj" />
<ProjectReference Include="..\..\LittleTown.StaticDataAccess\LittleTown.StaticDataAccess.csproj" />
</ItemGroup>
</Project> </Project>

8
src/LittleTown.Blazor/LittleTown.Blazor.Client/Pages/Match.razor
View File

@@ -1,8 +0,0 @@
@page "/match"
@rendermode InteractiveAuto
<PageTitle>Match</PageTitle>
<div class="board">
<MatchBoard MatchViewModel="MatchViewModel" />
</div>

16
src/LittleTown.Blazor/LittleTown.Blazor.Client/Pages/Match.razor.cs
View File

@@ -1,16 +0,0 @@
using LittleTown.Blazor.Client.Services;
using LittleTown.Blazor.Client.ViewModels;
using Microsoft.AspNetCore.Components;
namespace LittleTown.Blazor.Client.Pages;
public partial class Match(IMatchService matchServices)
{
public MatchViewModel MatchViewModel { get; private set; }
public override Task SetParametersAsync(ParameterView parameters)
{
MatchViewModel = new MatchViewModel(matchServices.GetMatch());
return base.SetParametersAsync(parameters);
}
}

4
src/LittleTown.Blazor/LittleTown.Blazor.Client/Pages/Match.razor.css
View File

@@ -1,4 +0,0 @@
.board {
width: 100%;
height: 50vh;
}

7
src/LittleTown.Blazor/LittleTown.Blazor.Client/Program.cs
View File

@@ -1,12 +1,5 @@
using LittleTown.Blazor.Client.Services;
using LittleTown.Core.Ports;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
var builder = WebAssemblyHostBuilder.CreateDefault(args); var builder = WebAssemblyHostBuilder.CreateDefault(args);
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
builder.Services.AddScoped<IStaticDataGetter, WasmStaticDataGetter>();
builder.Services.AddScoped<IMatchService, MatchService>();
await builder.Build().RunAsync(); await builder.Build().RunAsync();

13
src/LittleTown.Blazor/LittleTown.Blazor.Client/Services/IMatchService.cs
View File

@@ -1,13 +0,0 @@
using LittleTown.Core;
namespace LittleTown.Blazor.Client.Services
{
public interface IMatchService
{
/// <summary>
/// Temporaire, recupere l'instance d'un match par défaut
/// </summary>
/// <returns></returns>
Match GetMatch();
}
}

26
src/LittleTown.Blazor/LittleTown.Blazor.Client/Services/MatchService.cs
View File

@@ -1,26 +0,0 @@
using LittleTown.Core;
using LittleTown.Core.Ports;
namespace LittleTown.Blazor.Client.Services
{
public class MatchService : IMatchService
{
private readonly IStaticDataGetter _staticDataGetter;
private Match? _currentMatch;
public MatchService(IStaticDataGetter staticDataGetter)
{
_staticDataGetter = staticDataGetter;
}
/// <inheritdoc/>>
public Match GetMatch()
{
if (null == _currentMatch)
{
_currentMatch = new Match(_staticDataGetter);
}
return _currentMatch;
}
}
}

69
src/LittleTown.Blazor/LittleTown.Blazor.Client/Services/WasmStaticDataGetter.cs
View File

@@ -1,69 +0,0 @@
using System.Text.Json;
using LittleTown.Core;
using LittleTown.Core.Ports;
namespace LittleTown.Blazor.Client.Services;
/// <summary>
/// Implementation du getter de données static pour WebAssembly via HttpClient
/// </summary>
public class WasmStaticDataGetter : IStaticDataGetter
{
private readonly HttpClient _httpClient;
private string _boardData = "";
private string _buildingData = "";
private string _objectivesData = "";
private bool _isInitialized = false;
public WasmStaticDataGetter(HttpClient httpClient)
{
_httpClient = httpClient;
}
private async Task InitializeAsync()
{
if (_isInitialized) return;
_boardData = await _httpClient.GetStringAsync("data/Board1.json");
_buildingData = await _httpClient.GetStringAsync("data/Buildings.json");
_objectivesData = await _httpClient.GetStringAsync("data/Objectives.json");
_isInitialized = true;
}
/// <inheritdoc/>
public async Task<Board> GetBoardAsync(int version)
{
// Synchronous wrapper - not ideal but matches interface
await InitializeAsync();
Board board = JsonSerializer.Deserialize<Board>(_boardData)
?? throw new JsonException("Cannot deserialize Board");
return board;
}
public Board GetBoard(int version)
{
throw new NotImplementedException("Use the asynchronous version of GetBoard for WebAssembly.");
}
/// <inheritdoc/>
public ICollection<Building> GetBuildings()
{
InitializeAsync().GetAwaiter().GetResult();
List<Building> buildings = JsonSerializer.Deserialize<List<Building>>(_buildingData)
?? throw new JsonException("Cannot deserialize Buildings");
return buildings;
}
/// <inheritdoc/>
public ICollection<Objective> GetObjectives()
{
InitializeAsync().GetAwaiter().GetResult();
List<Objective> objectives = JsonSerializer.Deserialize<List<Objective>>(_objectivesData)
?? throw new JsonException("Cannot deserialize Objectives");
return objectives;
}
}

19
src/LittleTown.Blazor/LittleTown.Blazor.Client/ViewModels/MatchViewModel.cs
View File

@@ -1,19 +0,0 @@
using LittleTown.Core;
namespace LittleTown.Blazor.Client.ViewModels;
public class MatchViewModel(Match match)
{
public List<List<int>> Rows
{
get
{
List<List<int>> rows = new List<List<int>>();
for(int i = 0; i < 6; i++)
{
rows.Add(Enumerable.Range(i * 6, 9).ToList());
}
return rows;
}
}
}

4
src/LittleTown.Blazor/LittleTown.Blazor.Client/_Imports.razor
View File

@@ -1,4 +1,4 @@
@using System.Net.Http @using System.Net.Http
@using System.Net.Http.Json @using System.Net.Http.Json
@using Microsoft.AspNetCore.Components.Forms @using Microsoft.AspNetCore.Components.Forms
@using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Routing
@@ -7,5 +7,3 @@
@using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.AspNetCore.Components.Web.Virtualization
@using Microsoft.JSInterop @using Microsoft.JSInterop
@using LittleTown.Blazor.Client @using LittleTown.Blazor.Client
@using LittleTown.Blazor.Client.Components
@using LittleTown.StaticDataAcces;

276
src/LittleTown.Blazor/LittleTown.Blazor.Client/wwwroot/data/Board1.json
View File

@@ -1,276 +0,0 @@
{
"Width": 9,
"Height": 6,
"Tiles": [
{
"ResourceType": "None",
"PosX": 0,
"PosY": 0
},
{
"ResourceType": "Wood",
"PosX": 1,
"PosY": 0
},
{
"ResourceType": "Wood",
"PosX": 2,
"PosY": 0
},
{
"ResourceType": "None",
"PosX": 3,
"PosY": 0
},
{
"ResourceType": "Fish",
"PosX": 4,
"PosY": 0
},
{
"ResourceType": "Fish",
"PosX": 5,
"PosY": 0
},
{
"ResourceType": "None",
"PosX": 6,
"PosY": 0
},
{
"ResourceType": "None",
"PosX": 7,
"PosY": 0
},
{
"ResourceType": "Wood",
"PosX": 8,
"PosY": 0
},
{
"ResourceType": "None",
"PosX": 0,
"PosY": 1
},
{
"ResourceType": "None",
"PosX": 1,
"PosY": 1
},
{
"ResourceType": "None",
"PosX": 2,
"PosY": 1
},
{
"ResourceType": "None",
"PosX": 3,
"PosY": 1
},
{
"ResourceType": "None",
"PosX": 4,
"PosY": 1
},
{
"ResourceType": "None",
"PosX": 5,
"PosY": 1
},
{
"ResourceType": "Wood",
"PosX": 6,
"PosY": 1
},
{
"ResourceType": "None",
"PosX": 7,
"PosY": 1
},
{
"ResourceType": "None",
"PosX": 8,
"PosY": 1
},
{
"ResourceType": "Wood",
"PosX": 0,
"PosY": 2
},
{
"ResourceType": "None",
"PosX": 1,
"PosY": 2
},
{
"ResourceType": "None",
"PosX": 2,
"PosY": 2
},
{
"ResourceType": "None",
"PosX": 3,
"PosY": 2
},
{
"ResourceType": "None",
"PosX": 4,
"PosY": 2
},
{
"ResourceType": "None",
"PosX": 5,
"PosY": 2
},
{
"ResourceType": "None",
"PosX": 6,
"PosY": 2
},
{
"ResourceType": "None",
"PosX": 7,
"PosY": 2
},
{
"ResourceType": "Fish",
"PosX": 8,
"PosY": 2
},
{
"ResourceType": "Fish",
"PosX": 0,
"PosY": 3
},
{
"ResourceType": "None",
"PosX": 1,
"PosY": 3
},
{
"ResourceType": "None",
"PosX": 2,
"PosY": 3
},
{
"ResourceType": "None",
"PosX": 3,
"PosY": 3
},
{
"ResourceType": "None",
"PosX": 4,
"PosY": 3
},
{
"ResourceType": "None",
"PosX": 5,
"PosY": 3
},
{
"ResourceType": "None",
"PosX": 6,
"PosY": 3
},
{
"ResourceType": "None",
"PosX": 7,
"PosY": 3
},
{
"ResourceType": "None",
"PosX": 8,
"PosY": 3
},
{
"ResourceType": "None",
"PosX": 0,
"PosY": 4
},
{
"ResourceType": "None",
"PosX": 1,
"PosY": 4
},
{
"ResourceType": "None",
"PosX": 2,
"PosY": 4
},
{
"ResourceType": "None",
"PosX": 3,
"PosY": 4
},
{
"ResourceType": "None",
"PosX": 4,
"PosY": 4
},
{
"ResourceType": "None",
"PosX": 5,
"PosY": 4
},
{
"ResourceType": "None",
"PosX": 6,
"PosY": 4
},
{
"ResourceType": "None",
"PosX": 7,
"PosY": 4
},
{
"ResourceType": "None",
"PosX": 8,
"PosY": 4
},
{
"ResourceType": "Rock",
"PosX": 0,
"PosY": 5
},
{
"ResourceType": "None",
"PosX": 1,
"PosY": 5
},
{
"ResourceType": "Wood",
"PosX": 2,
"PosY": 5
},
{
"ResourceType": "Rock",
"PosX": 3,
"PosY": 5
},
{
"ResourceType": "None",
"PosX": 4,
"PosY": 5
},
{
"ResourceType": "Fish",
"PosX": 5,
"PosY": 5
},
{
"ResourceType": "None",
"PosX": 6,
"PosY": 5
},
{
"ResourceType": "Rock",
"PosX": 7,
"PosY": 5
},
{
"ResourceType": "Rock",
"PosX": 8,
"PosY": 5
}
]
}

183
src/LittleTown.Blazor/LittleTown.Blazor.Client/wwwroot/data/Buildings.json
View File

@@ -1,183 +0,0 @@
[
{
"Name": "Atelier",
"Price": {
"Rock": 2
},
"BeginnerBuilding": true
},
{
"Name": "Bar",
"Price": {
"Rock": 2,
"Cereal": 2
},
"BeginnerBuilding": false
},
{
"Name": "Boulangerie",
"Price": {
"Wood": 2
},
"BeginnerBuilding": true
},
{
"Name": "Brasserie",
"Price": {
"Wood": 2
},
"BeginnerBuilding": false
},
{
"Name": "Carriere",
"Price": {
"Wood": 3
},
"BeginnerBuilding": true
},
{
"Name": "Champsdeble",
"Price": {
"Wood": 1
},
"BeginnerBuilding": false
},
{
"Name": "Charpentier",
"Price": {
"Wood": 2
},
"BeginnerBuilding": false
},
{
"Name": "Epicerie",
"Price": {
"Wood": 2
},
"BeginnerBuilding": true
},
{
"Name": "Entrepot",
"Price": {
"Rock": 4
},
"BeginnerBuilding": true
},
{
"Name": "Eglise",
"Price": {
"Rock": 4
},
"BeginnerBuilding": true
},
{
"Name": "Foire",
"Price": {
"Wood": 4
},
"BeginnerBuilding": false
},
{
"Name": "Fontaine",
"Price": {
"Rock": 2
},
"BeginnerBuilding": false
},
{
"Name": "Grenier",
"Price": {
"Wood": 4
},
"BeginnerBuilding": true
},
{
"Name": "Librairie",
"Price": {
"Rock": 4
},
"BeginnerBuilding": false
},
{
"Name": "minedor",
"Price": {
"Wood": 1,
"Rock": 1
},
"BeginnerBuilding": true
},
{
"Name": "poissonnier",
"Price": {
"Wood": 1,
"Rock": 1
},
"BeginnerBuilding": false
},
{
"Name": "Ponton",
"Price": {
"Wood": 3
},
"BeginnerBuilding": false
},
{
"Name": "Preteursurgage",
"Price": {
"Wood": 3
},
"BeginnerBuilding": true
},
{
"Name": "puits",
"Price": {
"Wood": 1,
"Rock": 1
},
"BeginnerBuilding": true
},
{
"Name": "Restaurant",
"Price": {
"Wood": 2,
"Rock": 2
},
"BeginnerBuilding": false
},
{
"Name": "Statue",
"Price": {
"Rock": 4
},
"BeginnerBuilding": true
},
{
"Name": "Cathedrale",
"Price": {
"Rock": 6
},
"BeginnerBuilding": false
},
{
"Name": "Residence",
"Price": {
"Piece": 6
},
"BeginnerBuilding": false
},
{
"Name": "Chateau",
"Price": {
"Rock": 6
},
"BeginnerBuilding": true
},
{
"Name": "Tourdegarde",
"Price": {
"Wood": 3,
"Rock": 3
},
"BeginnerBuilding": false
}
]

92
src/LittleTown.Blazor/LittleTown.Blazor.Client/wwwroot/data/Objectives.json
View File

@@ -1,92 +0,0 @@
[
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 2
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
},
{
"Description": "desc",
"Formula": "formula",
"Points": 3
}
]

2
src/LittleTown.Blazor/LittleTown.Blazor/Components/App.razor
View File

@@ -1,4 +1,4 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>

5
src/LittleTown.Blazor/LittleTown.Blazor/Components/Layout/NavMenu.razor
View File

@@ -19,10 +19,5 @@
<span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter <span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter
</NavLink> </NavLink>
</div> </div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="match">
<span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Match
</NavLink>
</div>
</nav> </nav>
</div> </div>

5
src/LittleTown.Blazor/LittleTown.Blazor/LittleTown.Blazor.csproj
View File

@@ -12,9 +12,4 @@
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.2" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\LittleTown.Core\LittleTown.Core.csproj" />
<ProjectReference Include="..\..\LittleTown.StaticDataAccess\LittleTown.StaticDataAccess.csproj" />
</ItemGroup>
</Project> </Project>

6
src/LittleTown.Blazor/LittleTown.Blazor/LittleTown.Blazor.csproj.user
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ActiveDebugProfile>https</ActiveDebugProfile>
</PropertyGroup>
</Project>

9
src/LittleTown.Blazor/LittleTown.Blazor/Program.cs
View File

@@ -1,7 +1,5 @@
using LittleTown.Blazor.Client.Services; using LittleTown.Blazor.Client.Pages;
using LittleTown.Blazor.Components; using LittleTown.Blazor.Components;
using LittleTown.Core.Ports;
using LittleTown.StaticDataAcces;
var builder = WebApplication.CreateBuilder(args); var builder = WebApplication.CreateBuilder(args);
@@ -10,9 +8,6 @@ builder.Services.AddRazorComponents()
.AddInteractiveServerComponents() .AddInteractiveServerComponents()
.AddInteractiveWebAssemblyComponents(); .AddInteractiveWebAssemblyComponents();
builder.Services.AddScoped<IStaticDataGetter, StaticDataGetter>();
builder.Services.AddScoped<IMatchService, MatchService>();
var app = builder.Build(); var app = builder.Build();
// Configure the HTTP request pipeline. // Configure the HTTP request pipeline.
@@ -37,4 +32,4 @@ app.MapRazorComponents<App>()
.AddInteractiveWebAssemblyRenderMode() .AddInteractiveWebAssemblyRenderMode()
.AddAdditionalAssemblies(typeof(LittleTown.Blazor.Client._Imports).Assembly); .AddAdditionalAssemblies(typeof(LittleTown.Blazor.Client._Imports).Assembly);
await app.RunAsync(); app.Run();

2
src/LittleTown.Core/Aggregates/MatchAggregate/Match.cs
View File

@@ -44,7 +44,7 @@ public class Match
{ {
ArgumentNullException.ThrowIfNull(staticData); ArgumentNullException.ThrowIfNull(staticData);
_board = staticData.GetBoardAsync(1).GetAwaiter().GetResult(); _board = staticData.GetBoard(1);
_buildings = staticData.GetBuildings(); _buildings = staticData.GetBuildings();
_objectives = staticData.GetObjectives(); _objectives = staticData.GetObjectives();
} }

5
src/LittleTown.Core/PortInterfaces/Inputs/IStaticDataGetter.cs
View File

@@ -5,11 +5,6 @@ namespace LittleTown.Core.Ports;
/// </summary> /// </summary>
public interface IStaticDataGetter public interface IStaticDataGetter
{ {
/// <summary> Recuperer un plateau de jeu </summary>
/// <param name="version">la version du plateau (1 ou 2)</param>
/// <returns> une instance du plateau avec les données statique</returns>
public Task<Board> GetBoardAsync(int version);
/// <summary> Recuperer un plateau de jeu </summary> /// <summary> Recuperer un plateau de jeu </summary>
/// <param name="version">la version du plateau (1 ou 2)</param> /// <param name="version">la version du plateau (1 ou 2)</param>
/// <returns> une instance du plateau avec les données statique</returns> /// <returns> une instance du plateau avec les données statique</returns>

9
src/LittleTown.StaticDataAccess/LittleTown.StaticDataAccess.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net10.0</TargetFramework> <TargetFramework>net10.0</TargetFramework>
@@ -15,11 +15,4 @@
<ProjectReference Include="..\LittleTown.Core\LittleTown.Core.csproj" /> <ProjectReference Include="..\LittleTown.Core\LittleTown.Core.csproj" />
</ItemGroup> </ItemGroup>
<!-- Copier les fichiers JSON dans le dossier de build -->
<ItemGroup>
<Content Include="Data\*.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project> </Project>

17
src/LittleTown.StaticDataAccess/StaticDataGetter.cs
View File

@@ -26,16 +26,12 @@ public class StaticDataGetter : IStaticDataGetter
_buildingData = buildingData; _buildingData = buildingData;
} }
/// <summary> Constructeur avec les chemins par défaut </summary> /// <summary> Constructeur avec les chemins par défaut, à utiliser pour les tests seulement </summary>
public StaticDataGetter() public StaticDataGetter()
{ {
// Les fichiers JSON sont copiés dans le dossier de build via le .csproj string boardPath = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Board1.json");
// Ils sont donc toujours relatifs à l'exécutable string buildingPath = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Buildings.json");
var baseDirectory = AppContext.BaseDirectory; string objectivesPath = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Objectives.json");
string boardPath = Path.Combine(baseDirectory, "Data", "Board1.json");
string buildingPath = Path.Combine(baseDirectory, "Data", "Buildings.json");
string objectivesPath = Path.Combine(baseDirectory, "Data", "Objectives.json");
ReadFiles(boardPath, buildingPath, objectivesPath); ReadFiles(boardPath, buildingPath, objectivesPath);
} }
@@ -53,11 +49,6 @@ public class StaticDataGetter : IStaticDataGetter
return board; return board;
} }
public Task<Board> GetBoardAsync(int version)
{
return Task.FromResult(GetBoard(version));
}
/// <inheritdoc/> /// <inheritdoc/>
public ICollection<Building> GetBuildings() public ICollection<Building> GetBuildings()
{ {

6
src/LittleTown.sln
View File

@@ -14,14 +14,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LittleTown.Blazor", "LittleTown.Blazor", "{5142DF7A-0B25-DAC6-14FF-F9CE4E6A354A}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LittleTown.Blazor", "LittleTown.Blazor", "{5142DF7A-0B25-DAC6-14FF-F9CE4E6A354A}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LittleTown.Blazor", "LittleTown.Blazor\LittleTown.Blazor\LittleTown.Blazor.csproj", "{12579937-5A8E-44F9-AC45-B742B311102E}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LittleTown.Blazor", "LittleTown.Blazor\LittleTown.Blazor\LittleTown.Blazor.csproj", "{12579937-5A8E-44F9-AC45-B742B311102E}"
ProjectSection(ProjectDependencies) = postProject
{FA0DE9D0-F788-4734-BDA3-F89F71D757BA} = {FA0DE9D0-F788-4734-BDA3-F89F71D757BA}
EndProjectSection
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LittleTown.Blazor.Client", "LittleTown.Blazor\LittleTown.Blazor.Client\LittleTown.Blazor.Client.csproj", "{83375A45-793A-462B-BAB8-AD432FA49350}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LittleTown.Blazor.Client", "LittleTown.Blazor\LittleTown.Blazor.Client\LittleTown.Blazor.Client.csproj", "{83375A45-793A-462B-BAB8-AD432FA49350}"
ProjectSection(ProjectDependencies) = postProject
{FA0DE9D0-F788-4734-BDA3-F89F71D757BA} = {FA0DE9D0-F788-4734-BDA3-F89F71D757BA}
EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution